Index: applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java	(revision 32005)
+++ applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java	(revision 32516)
@@ -106,5 +106,5 @@
         super.setupDialog();
         
-        final DataSet ds = Main.main.getCurrentDataSet();
+        final DataSet ds = Main.getLayerManager().getEditDataSet();
         
         // Disables "Download in new layer" choice if there is no current data set (i.e no data layer)
Index: applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java	(revision 32005)
+++ applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java	(revision 32516)
@@ -136,5 +136,5 @@
             this.layer = new OsmDataLayer(this.ds, tr("Reverted changeset") + tr(" [id: {0}]", String.valueOf(changesetId)), null);
         } else {
-            this.layer = Main.main.getEditLayer();
+            this.layer = Main.getLayerManager().getEditLayer();
             this.ds = layer.data;
         }
@@ -155,5 +155,5 @@
                     @Override
                     public void run() {
-                        Main.main.addLayer(layer);
+                        Main.getLayerManager().addLayer(layer);
                     }
                 });
Index: applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java	(revision 32005)
+++ applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java	(revision 32516)
@@ -23,5 +23,5 @@
 
         if (hasRevertions) {
-            Main.main.getCurrentDataSet().addChangeSetTag("created_by", "reverter");
+            Main.getLayerManager().getEditDataSet().addChangeSetTag("created_by", "reverter");
         }
         return true;