Improve upload error messages

@tejohnso please review
Are you going to take out this fixed branch reference?