diff --git a/src/helma/scripting/ScriptingEngine.java b/src/helma/scripting/ScriptingEngine.java
index e53182d6..7bcf4625 100644
--- a/src/helma/scripting/ScriptingEngine.java
+++ b/src/helma/scripting/ScriptingEngine.java
@@ -42,6 +42,11 @@ public interface ScriptingEngine {
     public Object invoke (Object thisObject, String functionName, Object[] args)
 		throws ScriptingException;
 
+    /**
+     *  Let the evaluator know that the current evaluation has been aborted.
+     */
+    public void abort ();
+
     /**
      *  Get a property on an object
      */
diff --git a/src/helma/scripting/fesi/FesiEvaluator.java b/src/helma/scripting/fesi/FesiEvaluator.java
index 4da1e51d..132a0551 100644
--- a/src/helma/scripting/fesi/FesiEvaluator.java
+++ b/src/helma/scripting/fesi/FesiEvaluator.java
@@ -75,7 +75,7 @@ public final class FesiEvaluator implements ScriptingEngine {
 	    evaluator.reval = this;
 	    global = evaluator.getGlobalObject();
 	    for (int i=0; i<extensions.length; i++)
-             evaluator.addExtension (extensions[i]);
+	        evaluator.addExtension (extensions[i]);
 	    HopExtension hopx = new HopExtension (app);
 	    hopx.initializeExtension (this);
 	    MailExtension mailx = (MailExtension) evaluator.addExtension ("helma.scripting.fesi.extensions.MailExtension");
@@ -407,6 +407,15 @@ public final class FesiEvaluator implements ScriptingEngine {
 	}
     }
 
+    /**
+     *  Let the evaluator know that the current evaluation has been
+     *  aborted. This is done by setting the thread ref in the evaluator
+     * object to null.
+     */
+    public void abort () {
+	evaluator.thread = null;
+    }
+
 
     /**
      * Check if an object has a function property (public method if it