diff --git a/src/peers.c b/src/peers.c
index 0ab2e52..a4ea915 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -1162,10 +1162,10 @@
 	s->si[0].flags = SI_FL_NONE;
 	if (s->fe->options2 & PR_O2_INDEPSTR)
 		s->si[0].flags |= SI_FL_INDEP_STR;
-	s->si[0].conn.data_ctx = (void *)ps;
-	s->si[0].applet.st0 = PEER_SESSION_CONNECT;
 
 	stream_int_register_handler(&s->si[0], &peer_applet);
+	s->si[0].applet.st0 = PEER_SESSION_CONNECT;
+	s->si[0].conn.data_ctx = (void *)ps;
 
 	s->si[1].conn.t.sock.fd = -1; /* just to help with debugging */
 	s->si[1].owner = t;
diff --git a/src/stream_interface.c b/src/stream_interface.c
index ceed602..5f7ac3d 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -336,7 +336,8 @@
  * it is solicited. The task's processing function must call the applet's
  * function before returning. It must be deleted by the task handler using
  * stream_int_unregister_handler(), possibly from within the function itself.
- * It also pre-initializes applet.state to zero.
+ * It also pre-initializes applet.state to zero and the connection context
+ * to NULL.
  */
 struct task *stream_int_register_handler(struct stream_interface *si, struct si_applet *app)
 {