Fix issue #1136.

Olso added a check in the importer