Improves status and error messages