Apply error handling
Merge pull request #168 from jhadvig/error_handling

Merged by openshift-bot