more hackery, get exceptions kind of working