1 files changed, 5 insertions, 1 deletions

diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index 826dbd57a..5b4c39682 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -709,7 +709,11 @@ GNUNET_NAT_request_reversal (struct GNUNET_NAT_Handle *nh,
 void
 GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *nh)
 {
-  GNUNET_MQ_destroy (nh->mq);
+  if (NULL != nh->mq)
+  {
+    GNUNET_MQ_destroy (nh->mq);
+    nh->mq = NULL;
+  }
   GNUNET_free (nh->reg);
   GNUNET_free (nh);
 }