Cleanup, add stacktrace