Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java	(revision 10792)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java	(revision 10793)
@@ -10,4 +10,5 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
@@ -75,5 +76,6 @@
         List<Action> actions;
         if (selectedLayers.size() == 1) {
-            actions = Arrays.asList(selectedLayers.get(0).getMenuEntries());
+            Action[] entries = selectedLayers.get(0).getMenuEntries();
+            actions = entries != null ? Arrays.asList(entries) : Collections.emptyList();
         } else {
             // Very simple algorithm - first selected layer has actions order as in getMenuEntries, actions from other layers go to the end
