Begin working on separating import handling so one bad file

doesn't make both imports fail.