[580363] Improve diagnostics
4 files changed