diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index db330f998c..af88547ca9 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -951,8 +951,11 @@ afibreak:
 		/* initialize syncrdpos to the first
 		 * mid-layer table entry
 		 */
-		if (!bmp->syncrdpos)
+		if (!bmp->syncrdpos) {
 			bmp->syncrdpos = bgp_table_top(table);
+			if (!bmp->syncrdpos)
+				goto eor;
+		}
 
 		/* look for a valid mid-layer table */
 		do {
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 2cb13fb85f..2584939378 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -3899,6 +3899,12 @@ DEFPY (bgp_evpn_advertise_pip_ip_mac,
 		struct listnode *node = NULL;
 		struct bgpevpn *vpn = NULL;
 
+		/*
+		 * At this point if bgp_evpn is NULL and evpn is enabled
+		 * something stupid has gone wrong
+		 */
+		assert(bgp_evpn);
+
 		update_advertise_vrf_routes(bgp_vrf);
 
 		/* Update (svi) type-2 routes */
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 33eaf9ae74..b082aa9c6a 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -133,19 +133,20 @@ void sighup(void)
 	/*
 	 * This is turned off for the moment.  There is all
 	 * sorts of config turned off by bgp_terminate
-	 * that is not setup properly again in bgp_rest.
+	 * that is not setup properly again in bgp_reset.
 	 * I see no easy way to do this nor do I see that
 	 * this is a desirable way to reload config
 	 * given the yang work.
 	 */
 	/* Terminate all thread. */
-	bgp_terminate();
-	bgp_reset();
-	zlog_info("bgpd restarting!");
-
-	/* Reload config file. */
-	vty_read_config(NULL, bgpd_di.config_file, config_default);
+	/*
+	 * bgp_terminate();
+	 * bgp_reset();
+	 * zlog_info("bgpd restarting!");
 
+	 * Reload config file.
+	 * vty_read_config(NULL, bgpd_di.config_file, config_default);
+	 */
 	/* Try to return to normal operation. */
 }