1 files changed, 3 insertions, 2 deletions

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 3ed896775..9ac0fbee6 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -324,7 +324,7 @@ handle_client_create (void *cls,
     return;
   }
 
-  set = GNUNET_new (struct Set);
+  set = NULL;
 
   switch (ntohs (msg->operation))
   {
@@ -336,12 +336,13 @@ handle_client_create (void *cls,
       set = _GSS_union_set_create ();
       break;
     default:
-      GNUNET_free (set);
       GNUNET_break (0);
       GNUNET_SERVER_client_disconnect (client);
       return;
   }
 
+  GNUNET_assert (NULL != set);
+
   set->client = client;
   GNUNET_SERVER_client_keep (client);
   set->client_mq = GNUNET_MQ_queue_for_server_client (client);