Exceptions 2.0

Forgot to merge this down.

Sent from my keyboardless and touchless Kindle.