Some improved error messages.