Improved handling of import errors.
Fixed typo in error message.
Merge branch 'import-error-fix'