diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index a0327ba..328dc39 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -3045,13 +3045,19 @@
         }
         try
         {
-            return (m_extensionManager.getModule().getClassByDelegation(clazz.getName()) == clazz)
-                ? this : null;
+            // For implicit boot delegation, we don't want those classes
+            // to be shown as coming from the system bundle.
+            if (!clazz.getName().startsWith("java."))
+            {
+                return (m_extensionManager.getModule().getClassByDelegation(clazz.getName()) == clazz)
+                    ? this : null;
+            }
         }
         catch(ClassNotFoundException ex)
         {
-            return null;
+            // Ignore and return null.
         }
+        return null;
     }
 
     /**