Fix potential NPE in ContainerTreeIterator