Issue #201 - Improve error handling when an upload is cancelled