Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 2904)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 2905)
@@ -21,5 +21,4 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -327,4 +326,5 @@
             String[] value_array = values.split(",");
             String[] display_array;
+
             if(locale_display_values != null) {
                 display_array = locale_display_values.split(",");
@@ -332,4 +332,9 @@
                 display_array = display_values.split(",");
             } else {
+                display_array = value_array;
+            }
+
+            if (display_array.length != value_array.length) {
+                System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in display_values must be the same as in values", key, text));
                 display_array = value_array;
             }
@@ -642,6 +647,7 @@
                 MirroredInputStream s = new MirroredInputStream(source);
                 InputStream zip = s.getZipEntry("xml","preset");
-                if(zip != null)
+                if(zip != null) {
                     zipIcons = s.getFile();
+                }
                 InputStreamReader r;
                 try