Cleaning up some error messages