diff --git a/scheme/httpd/surflets/surflets.scm b/scheme/httpd/surflets/surflets.scm
index b6f96c4..230a4fe 100644
--- a/scheme/httpd/surflets/surflets.scm
+++ b/scheme/httpd/surflets/surflets.scm
@@ -31,7 +31,10 @@
 ;;;     (("button" . "on") ("reply" . "Oh, yes"))
 ;;; This works only for GET and POST methods.
 
-(define form-query parse-html-form-query)
+(define (form-query q)
+  (if q 
+      (parse-html-form-query q) 
+      '()))
 
 ;; Bindings of POST requests can be read only once, since they are
 ;; read from an input port. So we have to cache them, for the case of