diff -r 2b4574e617c0 -r 4417619a9bbd src/server/daemon/httprequest.c
--- a/src/server/daemon/httprequest.c	Thu Aug 09 11:08:49 2012 +0200
+++ b/src/server/daemon/httprequest.c	Sat Aug 18 11:39:34 2012 +0200
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <arpa/inet.h>
 
 #include "../public/nsapi.h"
@@ -64,7 +65,13 @@
 
     // create nsapi data structures
     NSAPISession *sn = malloc(sizeof(NSAPISession));
+    if(sn == NULL) {
+        /* TODO: error */
+    }
     NSAPIRequest *rq = malloc(sizeof(NSAPIRequest));
+    if(rq == NULL) {
+        /* TODO: error */
+    }
     request->rq = rq;
     rq->phase = NSAPIAuthTrans;
 
@@ -336,6 +343,11 @@
                 r = nsapi_finish_request(sn, rq);
             }
         }
+        
+        if(r == REQ_ABORTED) {
+            nsapi_error_request(sn, rq);
+        }
+        
     } while (r == REQ_RESTART);
 
     r = nsapi_finish_request(sn, rq);
@@ -350,6 +362,12 @@
     return 0;
 }
 
+int nsapi_error_request(NSAPISession *sn, NSAPIRequest *rq) {
+    // TODO
+    
+    return REQ_PROCEED;
+}
+
 int nsapi_authtrans(NSAPISession *sn, NSAPIRequest *rq) {
     HTTPObjectConfig *objconf = rq->vs->objects;
     httpd_object *obj = objconf->objects[0];