diff --git a/src/helma/framework/core/RequestEvaluator.java b/src/helma/framework/core/RequestEvaluator.java
index efecbbde..16c7fad4 100644
--- a/src/helma/framework/core/RequestEvaluator.java
+++ b/src/helma/framework/core/RequestEvaluator.java
@@ -421,7 +421,8 @@ public final class RequestEvaluator implements Runnable {
                                     // see if a valid node was returned
                                     if (thisObject == null) {
                                         reqtype = NONE;
-
+                                        abortTransaction();
+                                        done = true;
                                         break;
                                     }
                                 }
@@ -438,6 +439,7 @@ public final class RequestEvaluator implements Runnable {
                                 if (!functionexists) {
                                     // function doesn't exist, nothing to do here.
                                     reqtype = NONE;
+                                    abortTransaction();
                                 } else {
                                     try {