avoid double tracing + workaround for exceptions without status
4 files changed