Importer: improved error handling