Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java	(revision 34711)
+++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java	(revision 34801)
@@ -9,4 +9,5 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -111,6 +112,6 @@
 
         @Override
-        protected CadastreDataLayer createNewLayer(String layerName) {
-            String realLayerName = layerName != null ? layerName : url.substring(url.lastIndexOf('/')+1);
+        protected CadastreDataLayer createNewLayer(DataSet dataset, Optional<String> layerName) {
+            String realLayerName = layerName.isPresent() ? layerName.get() : url.substring(url.lastIndexOf('/')+1);
             if (realLayerName == null || realLayerName.isEmpty()) {
                 realLayerName = settings.getLayerName();