1 files changed, 3 insertions, 2 deletions

diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index b1a447cf3..2de58a070 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -162,8 +162,9 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (NULL == h)
     return;
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_STATISTICS_watch_cancel (h, subsystem, name, &printer, h));
+  if (NULL != subsystem && NULL != name)
+    GNUNET_assert (GNUNET_OK ==
+        GNUNET_STATISTICS_watch_cancel (h, subsystem, name, &printer, h));
   GNUNET_STATISTICS_destroy (h, GNUNET_NO);
   h = NULL;  
 }