diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 9065a265ad..e920ab812b 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -593,7 +593,7 @@ zebra_nhg_find_nexthop(uint32_t id, struct nexthop *nh, afi_t afi, int type)
 
 	nexthop_group_add_sorted(&nhg, nh);
 
-	zebra_nhg_find(&nhe, id, &nhg, NULL, nh->vrf_id, afi, 0);
+	zebra_nhg_find(&nhe, id, &nhg, NULL, nh->vrf_id, afi, type);
 
 	return nhe;
 }
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index f375036db2..309b0f4301 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -228,7 +228,7 @@ int route_entry_update_nhe(struct route_entry *re, struct nhg_hash_entry *new)
 
 		if (old)
 			zebra_nhg_decrement_ref(old);
-	} else if (!re->nhe->nhg)
+	} else if (!re->nhe)
 		/* This is the first time it's being attached */
 		route_entry_attach_ref(re, new);