Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 1896)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 1897)
@@ -127,4 +127,8 @@
 
     public void updateList() {
+        if (Main.main.getCurrentDataSet() == null) {
+            list.setSize(0);
+            return;
+        }
         Relation selected = getSelected();
         list.setSize(getNumRelations());
@@ -147,12 +151,5 @@
 
     public void activeLayerChange(Layer a, Layer b) {
-        if ((a == null || a instanceof OsmDataLayer) && b instanceof OsmDataLayer) {
-            if (a != null) {
-                ((OsmDataLayer)a).listenerDataChanged.remove(this);
-            }
-            ((OsmDataLayer)b).listenerDataChanged.add(this);
-            updateList();
-            repaint();
-        }
+        updateList();
     }
 
@@ -171,5 +168,4 @@
     public void dataChanged(OsmDataLayer l) {
         updateList();
-        repaint();
     }
 
@@ -213,5 +209,5 @@
     /**
      * Selects the relation <code>relation</code> in the list of relations.
-     * 
+     *
      * @param relation  the relation
      */