Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 14552)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 14553)
@@ -313,11 +313,12 @@
     private static List<LayerDetails> firstLeafLayer(List<LayerDetails> layers) {
         for (LayerDetails layer : layers) {
-            if (layer.getChildren().isEmpty()) {
+            boolean hasNoChildren = layer.getChildren().isEmpty();
+            if (hasNoChildren && layer.getName() != null) {
                 return Collections.singletonList(layer);
-            } else {
+            } else if (!hasNoChildren) {
                 return firstLeafLayer(layer.getChildren());
             }
         }
-        return Collections.emptyList();
+        throw new IllegalArgumentException("Unable to find a valid WMS layer");
     }