Simplified the patch by removing the unreachable code. (We are two who are almost sure it is unreachable. I guess this is sure enough.) And use the clearer abort message suggested by Augie Fackler. In the 2nd patch also use it for the other message which reports the same failure.