diff --git a/README b/README
index 1cf31703..ff7da70e 100644
--- a/README
+++ b/README
@@ -18,7 +18,8 @@ connection.c:
 
 For POST:
 =========
-- add support to decode multipart/form-data (#1221, TEST)
+- add support to decode multipart/form-data with 
+  nesting (used for files) -- #1221, TEST
 
 For SSL:
 ========
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 346abedf..02cdfe21 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -139,13 +139,12 @@ MHD_get_fdset (struct MHD_Daemon *daemon,
   struct MHD_Connection *pos;
   int fd;
 
-  fd = daemon->socket_fd;
   if ((daemon == NULL) ||
       (read_fd_set == NULL) ||
       (write_fd_set == NULL) ||
       (except_fd_set == NULL) ||
       (max_fd == NULL) ||
-      (fd == -1) ||
+      (-1 == (fd = daemon->socket_fd)) ||
       (daemon->shutdown == MHD_YES) ||
       ((daemon->options & MHD_USE_THREAD_PER_CONNECTION) != 0))
     return MHD_NO;