src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java

@@ -502,11 +502,14 @@
                 if (accept(comp)) {
                     return comp;
                 } else if (comp instanceof Container && comp != aContainer) {
                     Container cont = (Container)comp;
                     if (cont.isFocusTraversalPolicyProvider()) {
-                        return cont.getFocusTraversalPolicy().getLastComponent(cont);
+                        Component retComp = cont.getFocusTraversalPolicy().getLastComponent(cont);
+                        if (retComp != null) {
+                            return retComp;
+                        }
                     }
                 }
             }
         }
         return null;