Improve diagnostics when the node is up.
Merge bug26096