diff --git a/isisd/isis_snmp.c b/isisd/isis_snmp.c
index 522026dde4..fe6a2f4052 100644
--- a/isisd/isis_snmp.c
+++ b/isisd/isis_snmp.c
@@ -1037,6 +1037,8 @@ static int isis_snmp_circuit_level_lookup_next(
 			break;
 		}
 
+		assert(oid_idx != NULL);
+
 		/* We have to check level specified by index */
 		if (oid_idx[1] < IS_LEVEL_1) {
 			level = IS_LEVEL_1;
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 3497b26656..7894924a8e 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -1096,8 +1096,10 @@ void ospf6_asbr_send_externals_to_area(struct ospf6_area *oa)
 
 	for (ALL_LSDB(oa->ospf6->lsdb, lsa, lsanext)) {
 		if (ntohs(lsa->header->type) == OSPF6_LSTYPE_AS_EXTERNAL) {
-			zlog_debug("%s: Flooding AS-External LSA %s",
-				   __func__, lsa->name);
+			if (IS_OSPF6_DEBUG_ASBR)
+				zlog_debug("%s: Flooding AS-External LSA %s",
+					   __func__, lsa->name);
+
 			ospf6_flood_area(NULL, lsa, oa);
 		}
 	}