diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 2f37f39ffd..18a171ab80 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -1026,7 +1026,7 @@ bgp_stop (struct peer *peer)
 	  zlog_info ("%%ADJCHANGE: neighbor %s(%s) in vrf %s Down %s",
 		     peer->host,
 		     (peer->hostname) ? peer->hostname : "Unknown",
-		     (vrf->vrf_id != VRF_DEFAULT) ? vrf->name : "Default",
+		     vrf ? ((vrf->vrf_id != VRF_DEFAULT) ? vrf->name : "Default") : "",
 		     peer_down_str [(int) peer->last_reset]);
 	}
 
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 3d3bd90f5b..d07fc65bdf 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -1469,7 +1469,8 @@ bgp_zebra_announce (struct prefix *p, struct bgp_info *info, struct bgp *bgp,
           if (!ifindex)
 	    {
 	      if (info->peer->conf_if || info->peer->ifname)
-		ifindex = if_nametoindex (info->peer->conf_if ? info->peer->conf_if : info->peer->ifname);
+		ifindex = ifname2ifindex_vrf (info->peer->conf_if ? info->peer->conf_if :
+                                              info->peer->ifname, bgp->vrf_id);
 	      else if (info->peer->nexthop.ifp)
 		ifindex = info->peer->nexthop.ifp->ifindex;
 	    }