Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6311)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 6312)
@@ -740,6 +740,7 @@
         try {
             Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
-            m.matches();
-            return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
+            if (m.matches()) {
+                return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
+            }
         } catch (Exception e) {
             Main.warn(e);
@@ -747,6 +748,7 @@
         try {
             Matcher m = Pattern.compile("layer (.+)").matcher(o);
-            m.matches();
-            return tr("Layer: {0}", tr(m.group(1)));
+            if (m.matches()) {
+                return tr("Layer: {0}", tr(m.group(1)));
+            }
         } catch (Exception e) {
             Main.warn(e);