Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 11416)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java	(revision 11417)
@@ -94,8 +94,8 @@
             TaggingPreset group = preset.group;
             while (group != null) {
-                Collections.addAll(groups, group.getLocaleName().toLowerCase(Locale.ENGLISH).split("\\s"));
+                addLocaleNames(groups, group);
                 group = group.group;
             }
-            Collections.addAll(names, preset.getLocaleName().toLowerCase(Locale.ENGLISH).split("\\s"));
+            addLocaleNames(names, preset);
             for (TaggingPresetItem item: preset.data) {
                 if (item instanceof KeyedItem) {
@@ -115,4 +115,11 @@
                     }
                 }
+            }
+        }
+
+        private static void addLocaleNames(Collection<String> collection, TaggingPreset preset) {
+            String locName = preset.getLocaleName();
+            if (locName != null) {
+                Collections.addAll(collection, locName.toLowerCase(Locale.ENGLISH).split("\\s"));
             }
         }