[BISERVER-9599] Add minor error handling