diff --git a/include/proto/connection.h b/include/proto/connection.h
index 84f2f0e..9ee9e9a 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -33,7 +33,7 @@
 /* Calls the close() function of the data layer if any */
 static inline void conn_data_close(struct connection *conn)
 {
-	if (conn->data->close)
+	if (conn->data && conn->data->close)
 		conn->data->close(conn);
 }
 
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index 91691c0..724c27f 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -35,6 +35,8 @@
 void stream_int_retnclose(struct stream_interface *si, const struct chunk *msg);
 int conn_si_send_proxy(struct connection *conn, unsigned int flag);
 void stream_sock_update_conn(struct connection *conn);
+int stream_int_shutr(struct stream_interface *si);
+int stream_int_shutw(struct stream_interface *si);
 
 extern struct sock_ops stream_int_embedded;
 extern struct sock_ops stream_int_task;
@@ -164,13 +166,15 @@
 /* Sends a shutr to the connection using the data layer */
 static inline void si_shutr(struct stream_interface *si)
 {
-	si_data(si)->shutr(si);
+	if (stream_int_shutr(si))
+		EV_FD_CLR(si_fd(si), DIR_RD);
 }
 
 /* Sends a shutw to the connection using the data layer */
 static inline void si_shutw(struct stream_interface *si)
 {
-	si_data(si)->shutw(si);
+	if (stream_int_shutw(si))
+		EV_FD_CLR(si_fd(si), DIR_WR);
 }
 
 /* Calls the data state update on the stream interfaace */