Correct error messages to be clearer