Fixup exception handling/tracebacks