diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/EvaluatorException.java b/mozilla/js/rhino/src/org/mozilla/javascript/EvaluatorException.java
index 7d9f504131f..c7c9ce3ad9f 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/EvaluatorException.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/EvaluatorException.java
@@ -120,9 +120,9 @@ public class EvaluatorException extends RuntimeException
         return lineSource;
     }
 
-    private static String generateErrorMessage(String message,
-                                               String sourceName,
-                                               int line)
+    static String generateErrorMessage(String message,
+                                       String sourceName,
+                                       int line)
     {
         if (sourceName == null || line <= 0) {
             return message;
@@ -131,10 +131,9 @@ public class EvaluatorException extends RuntimeException
         buf.append(" (");
         if (sourceName != null) {
             buf.append(sourceName);
-            buf.append("; ");
         }
         if (line > 0) {
-            buf.append("line ");
+            buf.append('#');
             buf.append(line);
         }
         buf.append(')');
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java b/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java
index 150a378d5eb..ebefd2bb45b 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/JavaScriptException.java
@@ -63,7 +63,8 @@ public class JavaScriptException extends Exception
      */
     public JavaScriptException(Object value, String sourceName, int lineNumber)
     {
-        super(ScriptRuntime.toString(value));
+        super(EvaluatorException.generateErrorMessage(
+                  ScriptRuntime.toString(value), sourceName, lineNumber));
         this.lineNumber = lineNumber;
         this.sourceName = sourceName;
         this.value = value;