Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 3904)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 3905)
@@ -13,6 +13,6 @@
 
     /* only for display, no real type */
-    CLOSEDWAY  (marktr("closedway"), Way.class, WayData.class),
-    MULTIPOLYGON (marktr("multipolygon"), Relation.class, RelationData.class);
+    CLOSEDWAY  (marktr("closedway"), null, WayData.class),
+    MULTIPOLYGON (marktr("multipolygon"), null, RelationData.class);
 
     private final String apiTypeName;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitiveTypesComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitiveTypesComboBox.java	(revision 3904)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitiveTypesComboBox.java	(revision 3905)
@@ -13,5 +13,6 @@
     public OsmPrimitiveTypesComboBox() {
         for (OsmPrimitiveType type: OsmPrimitiveType.values()){
-            addItem(type);
+            if(type.getOsmClass() != null)
+                addItem(type);
         }
     }