Added error handling
Merge pull request #352 from jidel/issue#143-import_error_handling

Added error handling