Made sure we take better care of errors