Feature 82 : Fixing NPE when exporting wysiwyg