1 files changed, 4 insertions, 1 deletions

diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 53a44f338..2aa6cdbb0 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -413,7 +413,10 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_Handle *tth
   else
     p->cb_cls = p;
   p->start_cb = start_cb;
-  p->start_cb_cls = start_cb_cls;
+  if (NULL != start_cb_cls)
+    p->start_cb_cls = start_cb_cls;
+  else
+    p->start_cb_cls = p;
   GNUNET_CONTAINER_DLL_insert (tth->p_head,
                                tth->p_tail,
                                p);