Nicer errors
Merge pull request #30 from pinittome/nicer-errors

Nicer errors