Modify server on error to be consistent with the client on error