diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index 2f482bb5e45..2a19de1ec00 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -38,6 +38,8 @@
 struct ipc_private {
 	struct idr_context *idtree_fnum;
 
+	struct dcesrv_context *dcesrv;
+
 	/* a list of open pipes */
 	struct pipe_state {
 		struct pipe_state *next, *prev;
@@ -73,6 +75,7 @@ static struct pipe_state *pipe_state_find(struct ipc_private *private, uint16_t
 static NTSTATUS ipc_connect(struct ntvfs_module_context *ntvfs,
 			    struct smbsrv_request *req, const char *sharename)
 {
+	NTSTATUS status;
 	struct smbsrv_tcon *tcon = req->tcon;
 	struct ipc_private *private;
 
@@ -80,18 +83,19 @@ static NTSTATUS ipc_connect(struct ntvfs_module_context *ntvfs,
 	tcon->dev_type = talloc_strdup(tcon, "IPC");
 
 	/* prepare the private state for this connection */
-	private = talloc_p(tcon, struct ipc_private);
-	if (!private) {
-		return NT_STATUS_NO_MEMORY;
-	}
+	private = talloc(tcon, struct ipc_private);
+	NT_STATUS_HAVE_NO_MEMORY(private);
+
 	ntvfs->private_data = private;
 
 	private->pipe_list = NULL;
 
 	private->idtree_fnum = idr_init(private);
-	if (private->idtree_fnum == NULL) {
-		return NT_STATUS_NO_MEMORY;
-	}
+	NT_STATUS_HAVE_NO_MEMORY(private->idtree_fnum);
+
+	/* setup the DCERPC server subsystem */
+	status = dcesrv_init_context(private, &private->dcesrv);
+	NT_STATUS_NOT_OK_RETURN(status);
 
 	return NT_STATUS_OK;
 }
@@ -226,7 +230,7 @@ static NTSTATUS ipc_open_generic(struct ntvfs_module_context *ntvfs,
 		session_info = req->session->session_info;
 	}
 
-	status = dcesrv_endpoint_search_connect(req->smb_conn->dcesrv, 
+	status = dcesrv_endpoint_search_connect(private->dcesrv, 
 						&ep_description, 
 						session_info,
 						&p->dce_conn);
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index e6201c077e1..0b2fe668af0 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -852,9 +852,6 @@ void smbsrv_accept(struct server_connection *conn)
 
 	conn->private_data = smb_conn;
 
-	/* setup the DCERPC server subsystem */
-	dcesrv_init_context(smb_conn, &smb_conn->dcesrv);
-
 	return;
 }
 
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 5324fb8a671..8486ad0da6f 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -268,8 +268,6 @@ struct smbsrv_connection {
 
 	struct substitute_context substitute;
 
-	struct dcesrv_context *dcesrv;
-
 	/* the pid of the process handling this session */
 	pid_t pid;