diff --git a/configure b/configure
index ea4c079b4b..d5aff8b3e5 100755
--- a/configure
+++ b/configure
@@ -4843,6 +4843,7 @@ trap 'rm -fr `echo "make/rules
 	lib/tests/include/Makefile
 	lib/tests/include/tests/Makefile
 	bin/Makefile
+	bin/check/Makefile
 	bin/named/Makefile
 	bin/named/unix/Makefile
 	bin/rndc/Makefile
@@ -5090,6 +5091,7 @@ CONFIG_FILES=\${CONFIG_FILES-"make/rules
 	lib/tests/include/Makefile
 	lib/tests/include/tests/Makefile
 	bin/Makefile
+	bin/check/Makefile
 	bin/named/Makefile
 	bin/named/unix/Makefile
 	bin/rndc/Makefile
diff --git a/configure.in b/configure.in
index d53a3e40ab..611b1384b7 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.197 $)
+AC_REVISION($Revision: 1.198 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1259,6 +1259,7 @@ AC_OUTPUT(
 	lib/tests/include/Makefile
 	lib/tests/include/tests/Makefile
 	bin/Makefile
+	bin/check/Makefile
 	bin/named/Makefile
 	bin/named/unix/Makefile
 	bin/rndc/Makefile
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2bda375bcf..f89948c1ba 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.277 2000/12/13 01:42:23 tale Exp $ */
+/* $Id: zone.c,v 1.278 2000/12/13 06:21:42 marka Exp $ */
 
 #include <config.h>
 
@@ -1163,10 +1163,13 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 			zone_log(zone, me, ISC_LOG_ERROR,
 				 "has %d SOA records", soacount);
 			result = DNS_R_BADZONE;
-			goto cleanup;
 		}
-		if (nscount == 0)
+		if (nscount == 0) {
 			zone_log(zone, me, ISC_LOG_ERROR, "no NS records");
+			result = DNS_R_BADZONE;
+		}
+		if (result != ISC_R_SUCCESS)
+			goto cleanup;
 		if (zone->db != NULL) {
 			if (!isc_serial_ge(serial, zone->serial)) {
 				zone_log(zone, me, ISC_LOG_ERROR,
@@ -1229,7 +1232,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	result = ISC_R_SUCCESS;
 	if (needdump)
 		zone_needdump(zone, DNS_DUMP_DELAY);
-	zone_settimer(zone, now);
+	if (zone->task != NULL)
+		zone_settimer(zone, now);
 	return (result);
 
  cleanup: