Error handling

More work on error handling with bad responses from the server.  Bleh!