Also, rewrite one error message to make it follow our message style
guidelines better.

Euler Taveira and Tom Lane