diff --git a/classpath/java/lang/Class.java b/classpath/java/lang/Class.java
index 7d54102164..66529779d7 100644
--- a/classpath/java/lang/Class.java
+++ b/classpath/java/lang/Class.java
@@ -89,6 +89,9 @@ public final class Class <T> implements Type, GenericDeclaration {
                               ClassLoader loader)
     throws ClassNotFoundException
   {
+    if (loader == null) {
+      loader = Class.class.loader;
+    }
     Class c = loader.loadClass(name);
     if (initialize) {
       c.initialize();