diff --git a/CHANGES b/CHANGES
index e2d812e3b7..20085cfed8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3033.	[cleanup]	Add two INSIST(bucket != DNS_ADB_INVALIDBUCKET).
+			[RT #22521]
+
 3032.	[bug]		rdatalist.c: add missing REQUIREs. [RT #22521]
 
 3031.	[bug]		dns_rdataclass_format() handle a zero sized buffer.
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index a66a8eacc5..ba8b55347a 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.254 2010/12/21 23:47:08 tbox Exp $ */
+/* $Id: adb.c,v 1.255 2011/02/21 07:08:33 marka Exp $ */
 
 /*! \file
  *
@@ -2813,6 +2813,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
 	 */
 	bucket = DNS_ADB_INVALIDBUCKET;
 	adbname = find_name_and_lock(adb, name, find->options, &bucket);
+	INSIST(bucket != DNS_ADB_INVALIDBUCKET);
 	if (adb->name_sd[bucket]) {
 		DP(DEF_LEVEL,
 		   "dns_adb_createfind: returning ISC_R_SHUTTINGDOWN");
@@ -3945,6 +3946,7 @@ dns_adb_findaddrinfo(dns_adb_t *adb, isc_sockaddr_t *sa,
 	result = ISC_R_SUCCESS;
 	bucket = DNS_ADB_INVALIDBUCKET;
 	entry = find_entry_and_lock(adb, sa, &bucket, now);
+	INSIST(bucket != DNS_ADB_INVALIDBUCKET);
 	if (adb->entry_sd[bucket]) {
 		result = ISC_R_SHUTTINGDOWN;
 		goto unlock;