diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 6ede015a0e..db3f0b8b23 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -6784,12 +6784,13 @@ static int pim_rp_cmd_worker(struct pim_instance *pim, struct vty *vty,
 
 	if (result == PIM_GROUP_BAD_ADDR_MASK_COMBO) {
 		vty_out(vty, "%% Inconsistent address and mask: %s\n",
-			group);
+			group ? group : "No Group Address");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
 	if (result == PIM_GROUP_BAD_ADDRESS) {
-		vty_out(vty, "%% Bad group address specified: %s\n", group);
+		vty_out(vty, "%% Bad group address specified: %s\n",
+			group ? group : "No Group Address");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
@@ -7158,7 +7159,8 @@ static int pim_no_rp_cmd_worker(struct pim_instance *pim, struct vty *vty,
 	int result = pim_rp_del_config(pim, rp, group, plist);
 
 	if (result == PIM_GROUP_BAD_ADDRESS) {
-		vty_out(vty, "%% Bad group address specified: %s\n", group);
+		vty_out(vty, "%% Bad group address specified: %s\n",
+			group ? group : "No Group Address");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c
index 4e504c48b0..995fa6fb5a 100644
--- a/zebra/zebra_netns_notify.c
+++ b/zebra/zebra_netns_notify.c
@@ -185,7 +185,7 @@ static bool zebra_ns_notify_is_default_netns(const char *name)
 {
 	struct stat default_netns_stat;
 	struct stat st;
-	char netnspath[64];
+	char netnspath[PATH_MAX];
 
 	if (zebra_ns_notify_self_identify(&default_netns_stat))
 		return false;