diff --git a/Makefile.am b/Makefile.am
index 3429a15..bdcf044 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,4 +36,4 @@ EXTRA_DIST =		\
   pre-inst-env.in
 
 check: $(GOBJECTS) $(TESTS_GOBJECTS)
-	find tests -name "*.scm" | xargs -t -L1 ./test-env guile
+	find tests -maxdepth 1 -name "*.scm" | xargs -t -L1 ./test-env guile
diff --git a/knots/web-server.scm b/knots/web-server.scm
index 60b3f06..b51ca00 100644
--- a/knots/web-server.scm
+++ b/knots/web-server.scm
@@ -385,7 +385,8 @@ on the procedure being called at any particular time."
                                      #f
                                      "wrong number of values returned from handler, expecting 2, got ~A"
                                      (length other)))
-                                   handler)))))))))))))))
+                                   handler))))))))))
+               #:unwind? #t)))))
       (with-exception-handler
           (lambda (exn)
             (write-response-exception-handler exn request))