Merge pull request #435 from gregh3269/master

[WW-5088] Empty file upload, storeLocation null gives wrong error message.