Merge pull request #71 from polarkac/better_errors