Index: src/main/java/common/javax/swing/JTree.java =================================================================== --- src/main/java/common/javax/swing/JTree.java (revision 494382) +++ src/main/java/common/javax/swing/JTree.java (working copy) @@ -994,9 +994,19 @@ public Enumeration getExpandedDescendants(TreePath parent) { final Enumeration toggled = getDescendantToggledPaths(parent); + if (toggled == null) { return null; + } else { + if (toggled.hasMoreElements()) { + if (toggled.nextElement() == null) { + return null; + } + } else { + return null; + } } + return new Enumeration() { private TreePath nextElement = getNextExpandedPath();