Improve upload error messages

@tejohnso please review
and this one?