Improved error messages.