diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index f473b4604a..4114c45221 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -414,9 +414,9 @@ static void show_vni_entry(struct hash_backet *backet, void *args[])
 {
 	struct vty *vty;
 	json_object *json;
-	json_object *json_vni;
-	json_object *json_import_rtl;
-	json_object *json_export_rtl;
+	json_object *json_vni = NULL;
+	json_object *json_import_rtl = NULL;
+	json_object *json_export_rtl = NULL;
 	struct bgpevpn *vpn = (struct bgpevpn *)backet->data;
 	char buf1[10];
 	char buf2[RD_ADDRSTRLEN];
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 2323572488..09759628cb 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8396,6 +8396,7 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
 			vty_out(vty, "%s",
 				json_object_to_json_string_ext(json_paths, JSON_C_TO_STRING_PRETTY));
 			json_object_free(json_paths);
+			json_paths = NULL;
 			first = 0;
 		}
 	}
@@ -8409,7 +8410,8 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
 		*total_cum = total_count;
 	}
 	if (use_json) {
-		json_object_free(json_paths);
+		if (json_paths)
+			json_object_free(json_paths);
 		if (is_last)
 			vty_out(vty, " } }\n");
 		else