Merge pull request #849 from public/changeup-exceptions-2-electric-boogaloo

Use a single tagged exception instead of a hierarchy