Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java	(revision 35690)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java	(revision 35691)
@@ -98,5 +98,5 @@
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
         boolean hasSel = selection != null && !selection.isEmpty();
-        if (!hasSel) {
+        if (!hasSel && activeWays != null) {
             activeWays.clear();
         }