[cvs-nhc98] Improve error message formatting.