Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 7796)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 7797)
@@ -22,4 +22,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -139,6 +140,13 @@
     }
 
+    /**
+     * Returns the node icon that would be displayed for the given tag.
+     * @param tag The tag to look an icon for
+     * @param includeDeprecatedIcon if {@code true}, the special deprecated icon will be returned if applicable
+     * @return {@code null} if no icon found, or if the icon is deprecated and not wanted
+     */
     public static ImageIcon getNodeIcon(Tag tag, boolean includeDeprecatedIcon) {
         if (tag != null) {
+            DataSet ds = new DataSet();
             Node virtualNode = new Node(LatLon.ZERO);
             virtualNode.put(tag.getKey(), tag.getValue());
@@ -146,5 +154,8 @@
             MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
             try {
+                // Add primitive to dataset to avoid DataIntegrityProblemException when evaluating selectors
+                ds.addPrimitive(virtualNode);
                 styleList = getStyles().generateStyles(virtualNode, 0.5, false).a;
+                ds.removePrimitive(virtualNode);
             } finally {
                 MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();