diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
index b6ed4b2a90c9..39564ac64c0e 100644
--- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
+++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
@@ -172,7 +172,7 @@ static Object mbeanFor(MBeanContainer container, Object o)
             }
             klass = klass.getSuperclass();
         }
-        Object mbean = findMetaData(container, klass).newInstance(o);
+        Object mbean = findMetaData(container, o.getClass()).newInstance(o);
         if (mbean instanceof ObjectMBean)
             ((ObjectMBean)mbean).setMBeanContainer(container);
         if (LOG.isDebugEnabled())
diff --git a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java
index e313cbe83b5d..849d2812e9bf 100644
--- a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java
+++ b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/JettyLoggerFactory.java
@@ -130,7 +130,8 @@ static <T> T walkParentLoggerNames(String startName, Function<String, T> nameFun
             else
                 break;
         }
-        return null;
+
+        return nameFunction.apply(Logger.ROOT_LOGGER_NAME);
     }
 
     @Override