Import now fails properly.
Improved error reporting for imports.
Merge branch 'test' into dev