Index: /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 17350)
+++ /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 17351)
@@ -57,8 +57,6 @@
     public static UndoRedoHandler getInstance() {
         OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        if (editLayer != null) {
-            if (editLayer == MainApplication.getLayerManager().getActiveLayer()) {
-                return InstanceHolder.map.computeIfAbsent(editLayer.data, k -> new UndoRedoHandler());
-            }
+        if (editLayer != null && editLayer == MainApplication.getLayerManager().getActiveLayer()) {
+            return InstanceHolder.map.computeIfAbsent(editLayer.data, k -> new UndoRedoHandler());
         }
         return InstanceHolder.NO_DATA_SET_INSTANCE;