Improved error messages
Merge pull request #14 from cameronbwhite/master

Improved error messages