Merge "fix NPE in freeNode"