Improvements to error messages.