Merge pull request #80 from danmcp/master

Merged by openshift-bot
fix error handling