Somewhat improved error messages.