Handling failed uploads properly

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