Fix non-handling of ServerError