Be more error tolerant in importer