1 files changed, 10 insertions, 4 deletions

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 19e43f464..e357668d3 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -688,10 +688,16 @@ clean_up_running ()
 static void
 do_shutdown ()
 {
-  GNUNET_SERVER_destroy (server);
-  server = NULL;
-  GNUNET_SCHEDULER_cancel (child_death_task);
-  child_death_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != server)
+    {
+      GNUNET_SERVER_destroy (server);
+      server = NULL;
+    }
+  if (GNUNET_SCHEDULER_NO_TASK != child_death_task)
+    {
+      GNUNET_SCHEDULER_cancel (child_death_task);
+      child_death_task = GNUNET_SCHEDULER_NO_TASK;
+    }
 }
 
 #if DELAY_SHUTDOWN