[BISERVER-9167] Add better error handling