Enhance error messages
Merge pull request #139 from zachriggle/patch-3

Enhance error messages