diff --git a/src/session.c b/src/session.c
index 46b9f67..4295777 100644
--- a/src/session.c
+++ b/src/session.c
@@ -116,7 +116,6 @@
 	struct connection *cli_conn;
 	struct proxy *p = l->bind_conf->frontend;
 	struct session *sess;
-	struct stream *strm;
 	struct task *t;
 	int ret;
 
@@ -269,13 +268,9 @@
 		goto out_free_sess;
 
 	session_count_new(sess);
-	strm = stream_new(sess, t, &cli_conn->obj_type);
-	if (!strm)
+	if (!stream_new(sess, t, &cli_conn->obj_type))
 		goto out_free_task;
 
-	strm->target         = sess->listener->default_target;
-	strm->req.analysers |= sess->listener->analysers;
-
 	task_wakeup(t, TASK_WOKEN_INIT);
 	return 1;
 
@@ -424,7 +419,6 @@
 {
 	struct task *task = conn->owner;
 	struct session *sess = task->context;
-	struct stream *strm;
 
 	if (conn->flags & CO_FL_ERROR)
 		goto fail;
@@ -439,12 +433,9 @@
 
 	session_count_new(sess);
 	task->process = sess->listener->handler;
-	strm = stream_new(sess, task, &conn->obj_type);
-	if (!strm)
+	if (!stream_new(sess, task, &conn->obj_type))
 		goto fail;
 
-	strm->target         = sess->listener->default_target;
-	strm->req.analysers |= sess->listener->analysers;
 	conn->flags &= ~CO_FL_INIT_DATA;
 
 	task_wakeup(task, TASK_WOKEN_INIT);
diff --git a/src/stream.c b/src/stream.c
index 7874837..8e7ac60 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -189,7 +189,8 @@
 		s->si[1].flags |= SI_FL_INDEP_STR;
 
 	stream_init_srv_conn(s);
-	s->target = NULL;
+	s->target = sess->listener ? sess->listener->default_target : NULL;
+
 	s->pend_pos = NULL;
 
 	/* init store persistence */
@@ -197,7 +198,7 @@
 
 	channel_init(&s->req);
 	s->req.flags |= CF_READ_ATTACHED; /* the producer is already connected */
-	s->req.analysers = 0;
+	s->req.analysers = sess->listener ? sess->listener->analysers : 0;
 	channel_auto_connect(&s->req);  /* don't wait to establish connection */
 	channel_auto_close(&s->req);    /* let the producer forward close requests */