2 files changed, 3 insertions, 1 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index fb2a45b23..da78b39d9 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -2321,7 +2321,7 @@ run_validation (void *cls,
                   GNUNET_i2s (&id));
 #endif
       GNUNET_STATISTICS_update (stats,
-                                gettext_noop ("# peer addresses not validated (already in progress)"),
+                                gettext_noop ("# peer addresses not validated (in progress)"),
                                 1,
                                 GNUNET_NO);      
       return GNUNET_OK;
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 892463200..a08d98625 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -288,6 +288,7 @@ create_session (struct Plugin *plugin,
   struct PendingMessage *pm;
   struct WelcomeMessage welcome;
 
+  GNUNET_assert (client != NULL);
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
                    "tcp",
                    "Creating new session for peer `%4s'\n",
@@ -596,6 +597,7 @@ tcp_plugin_send (void *cls,
      where we could restrict the iteration to entries that match
      the target peer... */
   while ( (session != NULL) &&
+          (session->client != NULL) &&
           ( (0 != memcmp (target,
                           &session->target, 
                           sizeof (struct GNUNET_PeerIdentity))) ||