diff --git a/scheme/httpd/surflets/surflet-handler.scm b/scheme/httpd/surflets/surflet-handler.scm
index db376c6..72e5dd1 100644
--- a/scheme/httpd/surflets/surflet-handler.scm
+++ b/scheme/httpd/surflets/surflet-handler.scm
@@ -35,7 +35,7 @@
 ;; (HTTP-)RESPONSE. SURFLET-PATH is a string pointing to the real
 ;; directory where the SUrflets are searched.
 (define (surflet-handler surflet-path)
-  (set-thread-fluid! *options* (make-default-options surflet-path #f))
+  (set-thread-fluid! *options* (make-default-options surflet-path))
   (lambda (path req)
     (if (pair? path)			; need at least one element
 	(let ((request-method (request-method req))
@@ -393,12 +393,12 @@
 (define (delete-continuation! session-id continuation-id)
   (let ((session (session-lookup session-id)))
     (if session
-	(let ((continuation-table-lock (session-continuation-table-lock session))
-	      (continuation-table (session-continuation-table session))
-	      (continuations '()))
+	(let ((continuation-table-lock (session-continuation-table-lock session)))
 	  (obtain-lock continuation-table-lock)
-	  (if (table-ref continuation-table continuation-id)
-	      (table-set! continuation-table continuation-id #f))
+	  (let ((continuation-table (session-continuation-table session))
+		(continuations '()))
+	    (if (table-ref continuation-table continuation-id)
+		(table-set! continuation-table continuation-id #f)))
 	  (release-lock continuation-table-lock)))))
 
 ;;; SET-SURFLET-DATA!, GET-SURFLET-DATA