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

Improve error handling during import (See #10090) (rebased onto develop)