Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 30737)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 32482)
@@ -535,5 +535,5 @@
     private String FindRelation() {
         String relationDescription = null;
-        DataSet currentDataSet = Main.main.getCurrentDataSet();
+        DataSet currentDataSet = Main.getLayerManager().getEditDataSet();
         if (currentDataSet != null) {
             for (Relation relation : currentDataSet.getRelations()) {
@@ -583,5 +583,5 @@
         int namedWayCount = 0;
         int unNamedWayCount = 0;
-        DataSet currentDataSet = Main.main.getCurrentDataSet();
+        DataSet currentDataSet = Main.getLayerManager().getEditDataSet();
         if (currentDataSet != null) {
             for (OsmPrimitive osm : currentDataSet.getSelectedWays()) {
@@ -1034,5 +1034,5 @@
 
             // De-select address interpolation way; leave street selected
-            DataSet currentDataSet = Main.main.getCurrentDataSet();
+            DataSet currentDataSet = Main.getLayerManager().getEditDataSet();
             if (currentDataSet != null) {
                 currentDataSet.clearSelection(addrInterpolationWay);