diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
index 1d2ba3bf58..ac5cdd6acb 100644
--- a/bgpd/bgp_clist.c
+++ b/bgpd/bgp_clist.c
@@ -899,15 +899,13 @@ int community_list_set(struct community_list_handler *ch, const char *name,
 		}
 	}
 
-	if (str) {
-		if (style == COMMUNITY_LIST_STANDARD)
-			com = community_str2com(str);
-		else
-			regex = bgp_regcomp(str);
+	if (style == COMMUNITY_LIST_STANDARD)
+		com = community_str2com(str);
+	else
+		regex = bgp_regcomp(str);
 
-		if (!com && !regex)
-			return COMMUNITY_LIST_ERR_MALFORMED_VAL;
-	}
+	if (!com && !regex)
+		return COMMUNITY_LIST_ERR_MALFORMED_VAL;
 
 	entry = community_entry_new();
 	entry->direct = direct;
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 7ef9db9f0d..89a5333a2c 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -20663,6 +20663,7 @@ DEFUN (community_list_standard,
 	argv_find(argv, argc, "AA:NN", &idx);
 	char *str = argv_concat(argv, argc, idx);
 
+	assert(str);
 	int ret = community_list_set(bgp_clist, cl_name_or_number, str, seq,
 				     direct, style);
 
@@ -20775,6 +20776,7 @@ DEFUN (community_list_expanded_all,
 	argv_find(argv, argc, "AA:NN", &idx);
 	char *str = argv_concat(argv, argc, idx);
 
+	assert(str);
 	int ret = community_list_set(bgp_clist, cl_name_or_number, str, seq,
 				     direct, style);