TW-25: Adds error handling if the file was not uploaded correctly
Merge pull request #914 from m038/TW-25

TW-25