diff --git a/src/cfgparse.c b/src/cfgparse.c
index 6a9d42d65..2472a2159 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -4385,7 +4385,7 @@ int check_config_validity()
 				if (!LIST_ISEMPTY(&curpeers->peers_fe->conf.bind)) {
 					struct list *l;
 					struct bind_conf *bind_conf;
-					struct listener *li;
+					int ret;
 
 					l = &curpeers->peers_fe->conf.bind;
 					bind_conf = LIST_ELEM(l->n, typeof(bind_conf), by_fe);
@@ -4401,23 +4401,12 @@ int check_config_validity()
 						}
 					}
 
-					err = NULL;
-					if (thread_resolve_group_mask(&bind_conf->thread_set, 1, &err) < 0) {
-						ha_alert("Peers section '%s': %s in 'bind %s' at [%s:%d].\n",
-							 curpeers->peers_fe->id, err, bind_conf->arg, bind_conf->file, bind_conf->line);
-						free(err);
-						cfgerr++;
-					}
-					else if (atleast2(bind_conf->thread_set.grps)) {
-						ha_alert("Peers section '%s': 'thread' spans more than one group in 'bind %s' at [%s:%d].\n",
-							 curpeers->peers_fe->id, bind_conf->arg, bind_conf->file, bind_conf->line);
-						cfgerr++;
-					}
-
-					/* apply thread masks and groups to all receivers */
-					list_for_each_entry(li, &bind_conf->listeners, by_bind) {
-						li->rx.bind_thread = thread_set_nth_tmask(&bind_conf->thread_set, 0);
-						li->rx.bind_tgroup = thread_set_nth_group(&bind_conf->thread_set, 0);
+					/* finish the bind setup */
+					ret = bind_complete_thread_setup(bind_conf, &err_code);
+					if (ret != 0) {
+						cfgerr += ret;
+						if (err_code & ERR_FATAL)
+							goto out;
 					}
 
 					if (bind_conf->xprt->prepare_bind_conf &&
diff --git a/src/listener.c b/src/listener.c
index 67b64f69b..8a3aa7caf 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -1654,7 +1654,8 @@ int bind_complete_thread_setup(struct bind_conf *bind_conf, int *err_code)
 
 	err = NULL;
 	if (thread_resolve_group_mask(&bind_conf->thread_set, (fe == global.cli_fe) ? 1 : 0, &err) < 0) {
-		ha_alert("Proxy '%s': %s in 'bind %s' at [%s:%d].\n",
+		ha_alert("%s '%s': %s in 'bind %s' at [%s:%d].\n",
+			 proxy_type_str(fe),
 			 fe->id, err, bind_conf->arg, bind_conf->file, bind_conf->line);
 		free(err);
 		cfgerr++;