Improve error handling

If any kind of error is thrown and caught, we expect to see the SERVAIL response code sent.