Refactoring to use upstream error handling code for consistency
Merge pull request #145 from abhgupta/abhgupta-dev

Merged by openshift-bot