Merge staging: revise exceptions in file upload fix script.