fix

1 files changed, 9 insertions, 6 deletions

diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c
index 544bf6a43..27102f070 100644
--- a/src/statistics/gnunet-service-statistics.c
+++ b/src/statistics/gnunet-service-statistics.c
@@ -682,13 +682,13 @@ do_shutdown ()
 {
   struct WatchEntry *we;
   struct StatsEntry *se;
+  struct GNUNET_SERVER_Handle *s;
 
+  if (NULL == nc)
+    return;
   save ();
-  if (NULL != nc)
-  {
-    GNUNET_SERVER_notification_context_destroy (nc);
-    nc = NULL;
-  }
+  GNUNET_SERVER_notification_context_destroy (nc);
+  nc = NULL;  
   GNUNET_assert (NULL == client_head);
   while (NULL != (se = start))
   {
@@ -701,7 +701,10 @@ do_shutdown ()
     }
     GNUNET_free (se);
   }
-  GNUNET_SERVER_destroy (srv);
+  GNUNET_assert (NULL != srv);
+  s = srv;
+  srv = NULL;
+  GNUNET_SERVER_destroy (s);
 }