diff --git a/server/api/api.lisp b/server/api/api.lisp
index 6c99ea8..7ccff24 100644
--- a/server/api/api.lisp
+++ b/server/api/api.lisp
@@ -51,8 +51,8 @@
 (defmethod handle-update ((api api) data)
   (with-slots (gm) api
     (let* ((dir (getf data :direction))
-          (game-id (getf data :game-id))
-          (game (get-game gm game-id)))
+           (game-id (getf data :game-id))
+           (game (get-game gm game-id)))
       (cond
        ((equal dir "up") (setf dir :up))
        ((equal dir "down") (setf dir :down))
@@ -66,21 +66,22 @@
        (append (list :type "state") (dump gm game-id))))))
 
 
-;;; TODO: Improve error management
 (defmethod handle-request ((api api) request)
-  (flet ((handle-fun ()
-                     (let* ((data (parse-request request))
-                            (type (getf data :type)))
-                       (cond
-                        ((equal type "new-game") (handle-new-game api data))
-                        ((equal type "update") (handle-update api data))
-                        (t (format t "Unknow type"))))))
-        
-        (handler-case
-            (handle-fun)
-          (t (c)
-             (format t "Got an exception: ~a~%" c)
-             "Bad request"))))
+  ;; Catch request error and send it to the client
+  (handler-case
+      (let* ((data (parse-request request))
+             (type (getf data :type)))
+        (cond
+         ((equal type "new-game") (handle-new-game api data))
+         ((equal type "update") (handle-update api data))
+         (t (format t "Unknow type"))))            
+    (error (condition) ; Send reason to the client
+           (let ((reason (make-array 0 
+                                     :element-type 'character 
+                                     :adjustable t 
+                                     :fill-pointer 0)))
+             (format reason "~a~%" condition :escape nil)
+             reason))))