Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 7986)
+++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 7987)
@@ -478,5 +478,5 @@
                     allWays.addAll(pol.innerWays);
                 }
-                DataSet ds = Main.main.getCurrentDataSet();
+                DataSet ds = ways.iterator().next().getDataSet();
                 if (ds != null) {
                     ds.setSelected(allWays);
Index: trunk/src/org/openstreetmap/josm/actions/PasteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PasteAction.java	(revision 7986)
+++ trunk/src/org/openstreetmap/josm/actions/PasteAction.java	(revision 7987)
@@ -93,5 +93,5 @@
         // But this does not work if the shortcut is changed to a single key (see #9055)
         // Observed behaviour: getActionCommand() returns Action.NAME when triggered via menu, but shortcut text when triggered with it
-        if (!getValue(NAME).equals(e.getActionCommand())) {
+        if (e != null && !getValue(NAME).equals(e.getActionCommand())) {
             final Point mp = MouseInfo.getPointerInfo().getLocation();
             final Point tl = Main.map.mapView.getLocationOnScreen();
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 7986)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 7987)
@@ -1684,11 +1684,4 @@
 
         String[] obsolete = {
-                "validator.tests",                             // 01/2014 - can be removed end-2014. Replaced by validator.skip
-                "validator.testsBeforeUpload",                 // 01/2014 - can be removed end-2014. Replaced by validator.skipBeforeUpload
-                "validator.TagChecker.sources",                // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.TagChecker.usedatafile",            // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.TagChecker.useignorefile",          // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.TagChecker.usespellfile",           // 01/2014 - can be removed end-2014. Replaced by validator.TagChecker.source
-                "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.sources" // 01/2014 - can be removed end-2014. Replaced by validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries
         };
         for (String key : obsolete) {