Fix #8032 - speed up add remove of errors from tree