Merge "Import: Fix error reporting"