Better errors.
Merge pull request #534 from stevelacey/better-errors

Better errors