fix bz1036507 - improve error message
Merge pull request #4281 from rajatchopra/master

Merged by openshift-bot