Index: /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java
===================================================================
--- /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java	(revision 4416)
+++ /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java	(revision 4417)
@@ -114,10 +114,16 @@
 													try {
 														URL path = getClass().getResource("/standard/icons/"+atts.getValue(count));
-														curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+														if(path == null) {
+															/* icon not found, using default */
+															System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
+															path = getClass().getResource("/standard/icons/misc/no_icon.png");
+															curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+														} else {
+															curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+														}
 													}
 													catch (Exception e){
 														URL path = getClass().getResource("/standard/icons/amenity.png");
 														curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
-
 													}
 												}