--- old/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java	2015-04-06 10:50:53.536299700 +0400
+++ new/src/java.desktop/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java	2015-04-06 10:50:53.035271100 +0400
@@ -504,7 +504,10 @@
                 } 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;
+                        }
                     }
                 }
             }