1 files changed, 4 insertions, 2 deletions
diff --git a/vm/reference/java/lang/VMClassLoader.java b/vm/reference/java/lang/VMClassLoader.java
index 77e2810c5..107f1745e 100644
--- a/vm/reference/java/lang/VMClassLoader.java
+++ b/vm/reference/java/lang/VMClassLoader.java
@@ -117,12 +117,14 @@ final class VMClassLoader
    *
    * @param name the class name to load
    * @param resolve whether to resolve it
-   * @return the class, loaded by the bootstrap classloader
+   * @return the class, loaded by the bootstrap classloader or null
+   * if the class wasn't found. Returning null is equivalent to throwing
+   * a ClassNotFoundException (but a possible performance optimization).
    */
   static final Class loadClass(String name, boolean resolve)
     throws ClassNotFoundException
   {
-    throw new ClassNotFoundException(name);
+    return null;
   }
 
   /**