WIP
Display code where exception happened, add integration test