Package exceptions.

@frett I meant to do this as part of a previous PR