fix MPS-17789: illegal node access
fix MPS-17787: NPE