Improve error message content.

See NCBO-955.