diff --git a/pimd/pim_zpthread.c b/pimd/pim_zpthread.c
index e12a5c4374..b797ac184a 100644
--- a/pimd/pim_zpthread.c
+++ b/pimd/pim_zpthread.c
@@ -38,9 +38,6 @@ static void pim_mlag_zebra_fill_header(enum mlag_msg_type msg_type)
 	uint16_t data_len = 0;
 	uint16_t msg_cnt = 1;
 
-	if (msg_type == MLAG_MSG_NONE)
-		return;
-
 	switch (msg_type) {
 	case MLAG_REGISTER:
 	case MLAG_DEREGISTER:
@@ -55,6 +52,7 @@ static void pim_mlag_zebra_fill_header(enum mlag_msg_type msg_type)
 		fill_msg_type = MLAG_MROUTE_DEL_BULK;
 		break;
 	case MLAG_MSG_NONE:
+		return;
 	case MLAG_STATUS_UPDATE:
 	case MLAG_DUMP:
 	case MLAG_MROUTE_ADD_BULK:
diff --git a/zebra/zebra_l2_bridge_if.c b/zebra/zebra_l2_bridge_if.c
index 6574899927..b85d39bcd6 100644
--- a/zebra/zebra_l2_bridge_if.c
+++ b/zebra/zebra_l2_bridge_if.c
@@ -209,6 +209,8 @@ static int zebra_l2_bridge_if_vlan_update(struct interface *ifp,
 
 	zif = (struct zebra_if *)ifp->info;
 	bvlan = zebra_l2_bridge_if_vlan_find(zif, bvl->vid);
+	if (!bvlan)
+		return 0;
 
 	if (chgflags & ZEBRA_BRIDGEIF_ACCESS_BD_CHANGE)
 		bvlan->access_bd = bvl->access_bd;