1 files changed, 3 insertions, 0 deletions

diff --git a/src/util/client_manager.c b/src/util/client_manager.c
index f38d0f886..2fd52705e 100644
--- a/src/util/client_manager.c
+++ b/src/util/client_manager.c
@@ -196,6 +196,9 @@ recv_message (void *cls, const struct GNUNET_MessageHeader *msg)
     mgr->client_tmit = NULL;
   }
 
+  if (GNUNET_YES == mgr->is_disconnecting)
+    return;
+
   size_t i = 0;
   while (NULL != mgr->handlers[i].callback)
   {