Slight improvements to error messages.