Deal with error uploading. (Bug #1294 - part 1)