diff --git a/CHANGES b/CHANGES
index d994ca4418..c8c06a8c34 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1121.	[bug]		The server could attempt to access a NULL zone
+			table if shutting down while resolving.
+			[RT #1587, #2054]
+
 1120.	[bug]		Errors in options were not fatal. [RT #2002]
 
 1119.	[func]		Added support in Win32 for NTFS file/directory ACL's
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 20f083376e..8949c6874c 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.230 2001/11/12 19:05:31 gson Exp $ */
+/* $Id: resolver.c,v 1.231 2001/11/14 01:01:28 gson Exp $ */
 
 #include <config.h>
 
@@ -4062,6 +4062,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 	truncated = ISC_FALSE;
 	finish = NULL;
 
+	if (fctx->res->exiting) {
+		result = ISC_R_SHUTTINGDOWN;
+		goto done;
+	}
+
 	fctx->timeouts = 0;
 
 	/*