Minor improvements to upload errors.