Make some debug tracebacks a bit more clear they were handled.
Merge remote-tracking branch 'upstream/develop' into develop