Remove StorageExceptions
Merge branch 'develop' into feature/webdavssl