Make error messages clearer