diff --git a/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java b/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java
index a4ead222b3e..5324770ad9c 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/optimizer/OptIRFactory.java
@@ -60,7 +60,7 @@ public class OptIRFactory extends IRFactory {
                                                       (Node) statements, 
                                                       nameHelper);
         Context cx = Context.getCurrentContext();
-        if (cx.getDebugLevel() > 0)
+        if (cx != null && cx.getDebugLevel() > 0)
             result.setRequiresActivation(true);
         return result;
     }
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java
index a4ead222b3e..5324770ad9c 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/OptIRFactory.java
@@ -60,7 +60,7 @@ public class OptIRFactory extends IRFactory {
                                                       (Node) statements, 
                                                       nameHelper);
         Context cx = Context.getCurrentContext();
-        if (cx.getDebugLevel() > 0)
+        if (cx != null && cx.getDebugLevel() > 0)
             result.setRequiresActivation(true);
         return result;
     }