--- old/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java	2015-04-10 11:10:56.441370700 +0400
+++ new/src/java.desktop/share/classes/javax/swing/SortingFocusTraversalPolicy.java	2015-04-10 11:10:55.906340100 +0400
@@ -570,7 +570,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;
+                    }
                 }
             }
         }