diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index dcfad2a4f8..f57048c703 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -2837,13 +2837,14 @@ DEFPY(clear_ip_msdp_peer, clear_ip_msdp_peer_cmd,
 	const struct vrf *vrf;
 	struct pim_msdp_peer *mp;
 
-	if (vrfname) {
+	if (vrfname)
 		vrf = vrf_lookup_by_name(vrfname);
-		if (vrf == NULL)
-			return CMD_WARNING;
-	} else
+	else
 		vrf = vrf_lookup_by_id(VRF_DEFAULT);
 
+	if (vrf == NULL || vrf->info == NULL)
+		return CMD_WARNING;
+
 	pim = vrf->info;
 	for (ALL_LIST_ELEMENTS_RO(pim->msdp.peer_list, node, mp)) {
 		if (mp->peer.s_addr != peer.s_addr)