Improve wording in error messages.
Merge pull request #28 from davidlazar/master

Improve wording in error messages.