[cvs-nhc98] Improve error messages.