Merge pull request #363 from erickt/improve-errors

Improve errors