Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 8594)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 8595)
@@ -791,5 +791,6 @@
                 "waterway=stream | waterway=river | waterway=canal | waterway=drain | waterway=rapids | "+
                 "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
-                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | (highway=motorway_link & -oneway=no & -oneway=reversible)";
+                "junction=roundabout | (highway=motorway & -oneway=no & -oneway=reversible) | "+
+                "(highway=motorway_link & -oneway=no & -oneway=reversible)";
 
         try {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresets.java	(revision 8594)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresets.java	(revision 8595)
@@ -55,5 +55,9 @@
             for (final TaggingPreset p : taggingPresets) {
                 JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;
-                if (p instanceof TaggingPresetSeparator) {
+                if (m == null && p.group != null) {
+                    Main.error("No tagging preset submenu for " + p.group);
+                } else if (m == null) {
+                    Main.error("No tagging preset menu. Tagging preset " + p + " won't be available there");
+                } else if (p instanceof TaggingPresetSeparator) {
                     m.add(new JSeparator());
                 } else if (p instanceof TaggingPresetMenu) {