CAL-684 fix NodeNotFoundException