improved error messages
Merge branch 'master' of github.com:IPnett/cloud-baas