Move the import hits transaction boundary

* Align it with the file (which is where it should have been)
* Don't let a single failing file make it necessary to re-import the world