Try to make logging safer against re-entrance
2 files changed