Code Cleanup in importer
Better import error handling