diff --git a/src/cuirass/http.scm b/src/cuirass/http.scm
index 59e4ce1e2d6a7f1c644d42e8e73c69d6a823c5d9..05481846f9a771649329c9bf94eb5b68503f289b 100644
--- a/src/cuirass/http.scm
+++ b/src/cuirass/http.scm
@@ -79,17 +79,18 @@
   '((parameter value) ...)."
   (let* ((uri (request-uri request))
          (query (uri-query uri)))
-    (and query
-         (map (lambda (param)
-                (match (string-split param #\=)
-                  ((key param)
-                   (let ((key-symbol (string->symbol key)))
-                     (list key-symbol
-                           (match key-symbol
-                             ('id (string->number param))
-                             ('nr (string->number param))
-                             (_   param)))))))
-              (string-split query #\&)))))
+    (if query
+        (map (lambda (param)
+               (match (string-split param #\=)
+                 ((key param)
+                  (let ((key-symbol (string->symbol key)))
+                    (list key-symbol
+                          (match key-symbol
+                            ('id (string->number param))
+                            ('nr (string->number param))
+                            (_   param)))))))
+             (string-split query #\&))
+        '())))
 
 
 ;;;