diff --git a/example-jetty-embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java b/example-jetty-embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java
index c185e22a0f0..618833e2189 100644
--- a/example-jetty-embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java
+++ b/example-jetty-embedded/src/test/java/org/eclipse/jetty/embedded/TestXml.java
@@ -9,7 +9,7 @@ public class TestXml
         System.setProperty("jetty.home","../jetty-distribution/target/distribution");
         XmlConfiguration.main(new String[]
             {
-            "../jetty-jmx/src/main/config/etc/jetty-jmx.xml",
+            // "../jetty-jmx/src/main/config/etc/jetty-jmx.xml",
             "../jetty-server/src/main/config/etc/jetty.xml",
             "../jetty-spdy/spdy-jetty-http-webapp/src/main/config/etc/jetty-spdy.xml"
             }
diff --git a/jetty-plus/src/main/config/100-jetty-plus.ini b/jetty-plus/src/main/config/100-jetty-plus.ini
deleted file mode 100644
index 7e23d701fd0..00000000000
--- a/jetty-plus/src/main/config/100-jetty-plus.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTIONS=plus
-etc/jetty-plus.xml
\ No newline at end of file
diff --git a/jetty-plus/src/main/config/start.d b/jetty-plus/src/main/config/start.d
index e69de29bb2d..7e23d701fd0 100644
--- a/jetty-plus/src/main/config/start.d
+++ b/jetty-plus/src/main/config/start.d
@@ -0,0 +1,2 @@
+OPTIONS=plus
+etc/jetty-plus.xml
\ No newline at end of file
diff --git a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
index cb3d3006a17..93984f86d8d 100644
--- a/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
+++ b/jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
@@ -785,7 +785,7 @@ public class XmlConfiguration
         {
             String id = node.getAttribute("id");
             obj = _idMap.get(id);
-            if (obj == null)
+            if (obj == null && node.size()>0)
                 throw new IllegalStateException("No object for id=" + id);
             configure(obj,node,0);
             return obj;