CORE-449 Exporting throws Script Error
Merge pull request #1960 from reciprocity/hotfix/CORE-449

CORE-449 Exporting throws Script Error