Minor error message clean up