Improve upload error messages

@tejohnso please review