Improve error handling & reporting, especially race conditions with files being deleted.