(Contributed by Greg Chapman.)

Since this only changes the error message, I doubt that it should be
backported.