Bug 1065264 - Better error handling on status
Merge pull request #4775 from danmcp/master

Merged by openshift-bot