diff --git a/mozilla/js/rhino/org/mozilla/javascript/optimizer/Codegen.java b/mozilla/js/rhino/org/mozilla/javascript/optimizer/Codegen.java
index c71de2d3522..e3c00aa0a90 100644
--- a/mozilla/js/rhino/org/mozilla/javascript/optimizer/Codegen.java
+++ b/mozilla/js/rhino/org/mozilla/javascript/optimizer/Codegen.java
@@ -2398,7 +2398,7 @@ if (true) {
                                      "Ljava/lang/String;I)";   // filename & linenumber
                 aload(thisObjLocal);
                 aload(variableObjectLocal);
-                push(itsSourceFile);
+                push(itsSourceFile == null ? "" : itsSourceFile);
                 push(itsLineNumber);
             } else {
                 callSignature    = "(Lorg/mozilla/javascript/Context;" +
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
index c71de2d3522..e3c00aa0a90 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
@@ -2398,7 +2398,7 @@ if (true) {
                                      "Ljava/lang/String;I)";   // filename & linenumber
                 aload(thisObjLocal);
                 aload(variableObjectLocal);
-                push(itsSourceFile);
+                push(itsSourceFile == null ? "" : itsSourceFile);
                 push(itsLineNumber);
             } else {
                 callSignature    = "(Lorg/mozilla/javascript/Context;" +