Better error handling for file pull