Handling failed uploads properly

https://www.openstreetmap.org/user/SimonPoole/diary/406218