Better errors
Merge pull request #1 from c-oreills/master

Better errors