Useful error output
Merge pull request #3 from galanetal/master

Useful error output