Better error handling when upload fails

* Increase the timeout to 2min
* Display an error message when it fails