This makes the whole user experience more consistent when bumping into
failures, and more in line with the rewording done via 508300e2.

Author: Michael Paquier
Reviewed-by: Álvaro Herrera
Discussion: https://postgr.es/m/20190514153252.GA22168@alvherre.pgsql