Index: applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java
===================================================================
--- applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java	(revision 16589)
+++ applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java	(revision 16624)
@@ -148,5 +148,5 @@
 
                     // find out whether some data has already been downloaded
-                    Area present = Main.ds.getDataSourceArea();
+                    Area present = Main.main.getCurrentDataSet().getDataSourceArea();
                     if (present != null && !present.isEmpty()) {
                         Area toDownload = new Area(new Rectangle2D.Double(minlon,minlat,maxlon-minlon,maxlat-minlat));
@@ -191,8 +191,8 @@
                                 }
                             }
-                            for (Way w : Main.ds.ways) if (ways.contains(w.id)) newSel.add(w);
-                            for (Node n : Main.ds.nodes) if (nodes.contains(n.id)) newSel.add(n);
-                            for (Relation r : Main.ds.relations) if (relations.contains(r.id)) newSel.add(r);
-                            Main.ds.setSelected(newSel);
+                            for (Way w : Main.main.getCurrentDataSet().ways) if (ways.contains(w.id)) newSel.add(w);
+                            for (Node n : Main.main.getCurrentDataSet().nodes) if (nodes.contains(n.id)) newSel.add(n);
+                            for (Relation r : Main.main.getCurrentDataSet().relations) if (relations.contains(r.id)) newSel.add(r);
+                            Main.main.getCurrentDataSet().setSelected(newSel);
                             if (Main.pref.getBoolean("remotecontrol.permission.change-viewport", true))
                                 new AutoScaleAction("selection").actionPerformed(null);