Merge pull request #10 from Zash/better-errors