diff --git a/org.eclipse.gemini.jpa/src/org/eclipse/gemini/jpa/classloader/BundleProxyClassLoader.java b/org.eclipse.gemini.jpa/src/org/eclipse/gemini/jpa/classloader/BundleProxyClassLoader.java
index 95af563..81c3c6c 100644
--- a/org.eclipse.gemini.jpa/src/org/eclipse/gemini/jpa/classloader/BundleProxyClassLoader.java
+++ b/org.eclipse.gemini.jpa/src/org/eclipse/gemini/jpa/classloader/BundleProxyClassLoader.java
@@ -99,8 +99,9 @@
             // may result in attempt to resolve bundle which we
             // don't want as a side effect.
             debugClassLoader("Bundle has no classloader so loadClass(", name,
-                ") is returning null");
-            return null;
+                ") is throwing CNFE");
+            // Bug 412404 - throw CNFE instead of returning null
+            throw new ClassNotFoundException(name);
         } else {
             return bundle.loadClass(name);
         }