Merge staging fix exception/next bug in file upload fix script.