1 files changed, 10 insertions, 2 deletions

diff --git a/src/util/test_service.c b/src/util/test_service.c
index 3ffacb0a9..424a445bb 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -52,8 +52,11 @@ handle_recv (void *cls,
               "Received client message...\n");
   GNUNET_SERVICE_client_continue (client);
   global_ret = 2;
-  GNUNET_MQ_destroy (mq);
-  mq = NULL;
+  if (NULL != mq)
+  {
+    GNUNET_MQ_destroy (mq);
+    mq = NULL;
+  }
 }
 
 
@@ -106,6 +109,11 @@ static void
 timeout_task (void *cls)
 {
   tt = NULL;
+  if (NULL != mq)
+  {
+    GNUNET_MQ_destroy (mq);
+    mq = NULL;
+  }
   global_ret = 33;
   GNUNET_SCHEDULER_shutdown ();
 }