Fix client/server error behavior