CORE-461 Script error on import
Merge pull request #1961 from reciprocity/hotfix/CORE-461

CORE-461 Script error on import