diff --git a/scheme/httpd/cgi-server.scm b/scheme/httpd/cgi-server.scm
index bf5f99b..c3c8ca8 100644
--- a/scheme/httpd/cgi-server.scm
+++ b/scheme/httpd/cgi-server.scm
@@ -130,9 +130,10 @@
 	    (lambda (exit)
 	      (with-handler
 	       (lambda (condition more)
-		 (if (cgi-error? condition)
-		     (create-error-response condition req)
-		     (make-http-error-response http-status/internal-error req)))
+		 (exit
+		  (if (cgi-error? condition)
+		      (create-error-response condition req)
+		      (make-http-error-response http-status/internal-error req))))
 	       (lambda ()
 		 (compute-cgi path req bin-dir request-invariant-cgi-env)))))
 	   (make-http-error-response http-status/bad-request req "Empty CGI script"))))))