Some buildfarm members were still warning about this, because in
9c679a08 I'd missed decorating one of the ereport() code paths
with a dummy return.

Also, adjust the error messages to be more in line with project
style guide.