WIP Better exceptions

Clean up