Index: applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- applications/editors/josm/plugins/tageditor/build.xml	(revision 19585)
+++ applications/editors/josm/plugins/tageditor/build.xml	(revision 19587)
@@ -28,5 +28,5 @@
 
 
-	<property name="commit.message" value="Uses new constructor for Plugin" />
+	<property name="commit.message" value="Fixed NPE when icon is missing" />
 	<property name="plugin.main.version" value="2830" />
 
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java	(revision 19585)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java	(revision 19587)
@@ -69,4 +69,7 @@
 
 	public Icon getIcon() {
+		// FIXME: should also load icons from the image paths configured in the 
+		// preferences for presets
+		//
 		if (icon == null) {
 			// load the icon from the JOSM resources, use Main classloader
@@ -75,8 +78,8 @@
 			if (url == null) {
 				logger.warning("failed to create URL for resource 'images/" + getIconName() + "'");
-				icon = null;
+				return null;
 			} else {
 				icon =new ImageIcon(url);
-			}
+			}		
 			Image i = icon.getImage().getScaledInstance(16, 16, Image.SCALE_DEFAULT);
 			icon = new ImageIcon(i);