Index: trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java	(revision 2185)
+++ trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java	(revision 2186)
@@ -10,12 +10,12 @@
 
     /**
-     * 
+     *
      */
-    private String role;
+    private final String role;
 
     /**
-     * 
+     *
      */
-    private OsmPrimitive member;
+    private final OsmPrimitive member;
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java	(revision 2185)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java	(revision 2186)
@@ -223,4 +223,5 @@
         }
 
+
         public synchronized boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
             if ((infoflags & ImageObserver.ALLBITS) != 0) {
@@ -229,4 +230,7 @@
                 loadImage();
                 notifyAll();
+            } else if ((infoflags & ImageObserver.ERROR) != 0) {
+                currentEntry.scaledImage = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_BINARY);
+                currentEntry = null;
             }
             return true;