Improve error messages
Merge pull request #2566 from danmcp/master

Merged by openshift-bot