Defensive programming added to wiki creation
Merge branch 'fix-7661' into deploy-spike