Fixed NullPointerException during import
Merge pull request #237 from jidel/issue#236-

Fixed NullPointerException during import