WIP: Fix exception structure.