1 files changed, 5 insertions, 2 deletions

diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index 557694cfb..ca435a371 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -333,8 +333,11 @@ do_disconnect (struct GNUNET_STATISTICS_Handle *h)
     GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
     h->th = NULL;
   } 
-  GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
-  h->client = NULL;
+  if (NULL != h->client)
+  {
+    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    h->client = NULL;
+  }
   h->receiving = GNUNET_NO;
   if (NULL != (c = h->current))
   {