Improve error messages a bit
Merge pull request #17 from public/better-errors

Improve error messages a bit