diff --git a/mongoose.c b/mongoose.c
index 24cf74039540c988c45e9d28a03ce3f6fe1ee073..7bc6e60f08c27288acec8f9b678fc885182c6a93 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -597,7 +597,7 @@ static struct ns_connection *accept_conn(struct ns_server *server) {
 
     ns_add_conn(server, c);
     ns_call(c, NS_ACCEPT, &sa);
-    DBG(("%p %d %p %p", c, c->sock, c->ssl, server->ssl_ctx));
+    DBG(("%p %d %p %p %d", c, c->sock, c->ssl, server->ssl_ctx, c->flags));
   }
 
   return c;
@@ -4436,7 +4436,7 @@ const char *mg_set_option(struct mg_server *server, const char *name,
     *v = NULL;
   }
 
-  if (value == NULL) return NULL;
+  if (value == NULL || value[0] == '\0') return NULL;
 
   *v = mg_strdup(value);
   DBG(("%s [%s]", name, *v));