Index: trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 9348)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 9349)
@@ -183,11 +183,12 @@
                             return new TimestampRange(minDate, maxDate);
                         } else {
-                            // I18n: Don't translate timestamp keyword
-                            throw new ParseError(tr("Expecting <i>min</i>/<i>max</i> after ''timestamp''"));
+                            throw new ParseError("<html>" + tr("Expecting {0} after {1}", "<i>min</i>/<i>max</i>", "<i>timestamp</i>"));
                         }
                     }
-                }
-            }
-            return null;
+                } else {
+                    throw new ParseError("<html>" + tr("Expecting {0} after {1}", "<code>:</code>", "<i>" + keyword + "</i>"));
+                }
+            }
+            throw new IllegalStateException("Not expecting keyword " + keyword);
         }
 
