Ensure error message is cleaned up on node deletion and on cacche cleanup, MPS-19170