Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java	(revision 6322)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java	(revision 6323)
@@ -58,5 +58,7 @@
         if (buttonIndex == 0) {
             TaggingPreset preset = selector.getSelectedPreset();
-            preset.actionPerformed(null);
+            if (preset != null) {
+                preset.actionPerformed(null);
+            }
         }
         selector.savePreferences();