Put exception into its own class
Merge branch 'master' of https://github.com/Ourobor/petulant-batman