Recover from errors more gracefully during export