diff --git a/src/lib/connection.c b/src/lib/connection.c
index d2563f3002..5a4af923b2 100644
--- a/src/lib/connection.c
+++ b/src/lib/connection.c
@@ -512,7 +512,6 @@ void connection_init_server(struct connection_list *list,
 			    struct connection *conn, const char *name,
 			    int fd_in, int fd_out)
 {
-	i_assert(name != NULL);
 	i_assert(!list->set.client);
 
 	connection_init_full(list, conn, name, fd_in, fd_out);
@@ -548,7 +547,6 @@ void connection_init_client_fd(struct connection_list *list,
 			       struct connection *conn, const char *name,
 			       int fd_in, int fd_out)
 {
-	i_assert(name != NULL);
 	i_assert(list->set.client);
 
 	connection_init_full(list, conn, name, fd_in, fd_out);
@@ -624,8 +622,6 @@ void connection_init_from_streams(struct connection_list *list,
 				  struct connection *conn, const char *name,
 				  struct istream *input, struct ostream *output)
 {
-	i_assert(name != NULL);
-
 	connection_init_full(list, conn, name,
 			     i_stream_get_fd(input), o_stream_get_fd(output));
 
diff --git a/src/lib/connection.h b/src/lib/connection.h
index 2c26ec2c1f..db727d7dcd 100644
--- a/src/lib/connection.h
+++ b/src/lib/connection.h
@@ -167,12 +167,12 @@ void connection_init(struct connection_list *list, struct connection *conn,
 		     const char *name) ATTR_NULL(3);
 void connection_init_server(struct connection_list *list,
 			    struct connection *conn, const char *name,
-			    int fd_in, int fd_out);
+			    int fd_in, int fd_out) ATTR_NULL(3);
 void connection_init_server_ip(struct connection_list *list,
 			       struct connection *conn, const char *name,
 			       int fd_in, int fd_out,
 			       const struct ip_addr *remote_ip,
-			       in_port_t remote_port) ATTR_NULL(6);
+			       in_port_t remote_port) ATTR_NULL(3, 6);
 void connection_init_client_ip(struct connection_list *list,
 			       struct connection *conn, const char *name,
 			       const struct ip_addr *ip, in_port_t port)
@@ -184,10 +184,12 @@ void connection_init_client_ip_from(struct connection_list *list,
 void connection_init_client_unix(struct connection_list *list,
 				 struct connection *conn, const char *path);
 void connection_init_client_fd(struct connection_list *list,
-			       struct connection *conn, const char *name, int fd_int, int fd_out);
+			       struct connection *conn, const char *name,
+			       int fd_int, int fd_out) ATTR_NULL(3);
 void connection_init_from_streams(struct connection_list *list,
-			    struct connection *conn, const char *name,
-			    struct istream *input, struct ostream *output);
+				  struct connection *conn, const char *name,
+				  struct istream *input,
+				  struct ostream *output) ATTR_NULL(3);
 
 int connection_client_connect(struct connection *conn);