WK-1302 improve error handling
Merge pull request #11 from asgoodasnu/WK-1302

WK-1302 improve error handling