correct error message
Merge pull request #1710 from KenjiOhtsuka/1.8/bugfix/modify_error_message

modify error message, etc.