[BISERVER-9599] Add minor error handling
Merge pull request #709 from bytekast/BISERVER-9599

[BISERVER-9599] Add minor error handling