2 files changed, 6 insertions, 1 deletions

diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c
index bf1a127c5..216456296 100644
--- a/src/mesh/gnunet-service-mesh_channel.c
+++ b/src/mesh/gnunet-service-mesh_channel.c
@@ -2324,6 +2324,12 @@ GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
       }
       chq->tq = GMT_send_prebuilt_message (message, ch->t, GNUNET_YES,
                                            &ch_message_sent, chq);
+      if (NULL != chq->tq)
+      {
+        GNUNET_break (0);
+        GNUNET_free (chq);
+        chq = NULL;
+      }
       chq->rel->uniq = chq;
       break;
 
diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c
index 83c024de1..020765584 100644
--- a/src/mesh/gnunet-service-mesh_tunnel.c
+++ b/src/mesh/gnunet-service-mesh_tunnel.c
@@ -1748,7 +1748,6 @@ void
 GMT_remove_connection (struct MeshTunnel3 *t, struct MeshConnection *c)
 {
   struct MeshTConnection *aux;
-  unsigned int i;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Removing connection %s from tunnel %s\n",
        GMC_2s (c), GMT_2s (t));