bugzid: 10000 add error handling
Merge pull request #1 from robwil/master

bugzid: 10000 add error handling