Merge pull request #1 from PolicyStat/issue_1

Use real exceptions
Merge branch 'master' into issue_2