diff --git a/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java
index 5da2626241b..13307eb8e31 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java
@@ -2118,7 +2118,8 @@ public class ScriptRuntime {
                                   getContextClassLoaderMethod.invoke(
                                     Thread.currentThread(), 
                                     new Object[0]);
-                return cl.loadClass(className);
+                if (cl != null)
+                    return cl.loadClass(className);
             }
         } catch (SecurityException e) {
             // fall through...
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
index 5da2626241b..13307eb8e31 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
@@ -2118,7 +2118,8 @@ public class ScriptRuntime {
                                   getContextClassLoaderMethod.invoke(
                                     Thread.currentThread(), 
                                     new Object[0]);
-                return cl.loadClass(className);
+                if (cl != null)
+                    return cl.loadClass(className);
             }
         } catch (SecurityException e) {
             // fall through...