Improve error handling during import (See #10090)
Merge pull request #580 from jburel/import-error-handling

Improve error handling during import (See #10090)