2 files changed, 6 insertions, 1 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 6d160a76e..c44d5ef04 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -915,6 +915,7 @@ transmit_send_continuation (void *cls,
 
   GNUNET_assert (mq != NULL);
   n = mq->neighbour;
+  GNUNET_assert (n != NULL);
   GNUNET_assert (0 ==
                  memcmp (&n->id, target,
                          sizeof (struct GNUNET_PeerIdentity)));
@@ -2299,6 +2300,7 @@ plugin_env_receive (void *cls,
                   _
                   ("Dropping incoming message due to repeated bandwidth quota violations.\n"));
       /* TODO: call stats */
+      GNUNET_assert (NULL != service_context->neighbour);
       return service_context;
     }
   switch (ntohs (message->type))
@@ -2346,6 +2348,7 @@ plugin_env_receive (void *cls,
         }
       GNUNET_free (im);
     }
+  GNUNET_assert (NULL != service_context->neighbour);
   return service_context;
 }
 
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 9d82bead9..6ebb257a1 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1004,7 +1004,7 @@ tcp_plugin_send (void *cls,
   struct PendingMessage *pme;
 
   if (session == NULL)
-    session = find_session_by_target (plugin, target);
+    session = find_session_by_target (plugin, target);  
   pm = GNUNET_malloc (sizeof (struct PendingMessage) + ntohs (msg->size));
   pm->msg = (struct GNUNET_MessageHeader *) &pm[1];
   memcpy (pm->msg, msg, ntohs (msg->size));
@@ -1029,6 +1029,7 @@ tcp_plugin_send (void *cls,
       session->expecting_welcome = GNUNET_YES;
       session->still_connecting = GNUNET_YES;
       session->pending_messages = pm;
+      session->service_context = service_context;
       GNUNET_PEERINFO_for_all (plugin->env->cfg,
                                plugin->env->sched,
                                target,
@@ -1037,6 +1038,7 @@ tcp_plugin_send (void *cls,
     }
   GNUNET_assert (session != NULL);
   GNUNET_assert (session->still_connecting == GNUNET_NO);
+  session->service_context = service_context;
   /* append pm to pending_messages list */
   pme = session->pending_messages;
   if (pme == NULL)