1 files changed, 4 insertions, 1 deletions

diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index fab0fec5a..01419ce44 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -229,7 +229,10 @@ GNUNET_TRANSPORT_TESTING_start_peer (const char * cfgname,
   p->nc = nc;
   p->nd = nd;
   p->rec = rec;
-  p->cb_cls = cb_cls;
+  if (cb_cls != NULL)
+    p->cb_cls = cb_cls;
+  else
+    p->cb_cls = p;
 
   p->th = GNUNET_TRANSPORT_connect(p->cfg, NULL,
                             p,