Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 13940)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 13941)
@@ -1350,5 +1350,5 @@
     public Collection<OsmPrimitive> getInProgressSelection() {
         DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null) return null;
+        if (ds == null) return Collections.emptyList();
         if (getCurrentBaseNode() != null && !ds.selectionEmpty()) {
             Way continueFrom = getWayForNode(getCurrentBaseNode());
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 13940)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 13941)
@@ -543,5 +543,5 @@
         } else {
             OsmData<?, ?, ?, ?> ds = layerManager.getActiveData();
-            if (ds == null) return null;
+            if (ds == null) return Collections.emptyList();
             return ds.getSelected();
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 13940)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 13941)
@@ -566,5 +566,5 @@
 
         // Ignore parameter as we do not want to operate always on real selection here, especially in draw mode
-        Collection<? extends IPrimitive> newSel = Optional.ofNullable(Main.main.getInProgressISelection()).orElseGet(Collections::emptyList);
+        Collection<? extends IPrimitive> newSel = Main.main.getInProgressISelection();
         String selectedTag;
         Relation selectedRelation = null;
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java	(revision 13940)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java	(revision 13941)
@@ -309,5 +309,5 @@
 
     private boolean get(String key) {
-        return get(key, Boolean::parseBoolean, () -> false);
+        return get(key, Boolean::parseBoolean, () -> Boolean.FALSE);
     }