Improved file upload error handling.
Merge pull request #166 from Riball/master

Improved file upload error handling