Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java	(revision 17722)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java	(revision 17724)
@@ -8,5 +8,4 @@
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 
@@ -65,10 +64,8 @@
         String id = args.get("id");
         if (id != null) {
-            Optional<ImageryInfo> byId = ImageryLayerInfo.instance.getLayers().stream()
+            return ImageryLayerInfo.instance.getAllDefaultLayers().stream()
                     .filter(l -> Objects.equals(l.getId(), id))
-                    .findFirst();
-            if (byId.isPresent()) {
-                return byId.get();
-            }
+                    .findFirst()
+                    .orElseThrow(() -> new IllegalArgumentException("Cannot find layer for id " + id));
         }
         args.computeIfAbsent("type", ignore -> ImageryType.WMS.getDefault().getTypeString());