Index: applications/editors/josm/plugins/build-common.xml
===================================================================
--- applications/editors/josm/plugins/build-common.xml	(revision 36374)
+++ applications/editors/josm/plugins/build-common.xml	(revision 36375)
@@ -137,4 +137,5 @@
             <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED" unless:set="noErrorProne"/>
             <compilerarg line="-XDcompilePolicy=simple"/>
+            <compilerarg value="--should-stop=ifError=FLOW" />
             <compilerarg value="-processorpath"/>
             <compilerarg pathref="errorprone.classpath"/>
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java	(revision 36374)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java	(revision 36375)
@@ -106,7 +106,5 @@
         if (firstNode.isNew() && !secondNode.isNew())
             return buildReplaceNodeCommand(secondNode, firstNode);
-        else if (!firstNode.isNew() && secondNode.isNew())
-            return buildReplaceNodeCommand(firstNode, secondNode);
-        else
+        else // if (!firstNode.isNew() && secondNode.isNew()) -- merge same code branches
             // both nodes are new OR uploaded, act like MergeNodes, moving first
             // node to second