--- old/modules/javafx.controls/src/test/java/com/sun/javafx/scene/control/ContextMenuContentShim.java	2016-10-05 10:27:38.000000000 +1300
+++ new/modules/javafx.controls/src/test/java/com/sun/javafx/scene/control/ContextMenuContentShim.java	2016-10-05 10:27:37.000000000 +1300
@@ -132,7 +132,7 @@
         if (showingMenuContent.isPresent()) {
             ContextMenuContent content = showingMenuContent.get();
             int currentFocusIndex = content.getCurrentFocusIndex();
-            return showingMenuItems.get(currentFocusIndex);
+            return currentFocusIndex == -1 ? null : showingMenuItems.get(currentFocusIndex);
         }
 
         return null;