Better error handling related to 1024149
Merge pull request #4031 from danmcp/master

Merged by openshift-bot