* Improve information returned from upload errors * Fix the tests to for new behavior, add one for this specific case