public upload
use correct exception
Merge branch 'feature-public-upload' into development