Added exception is file is not deleteable, fixed check on upload (#685)