diff --git a/CHANGES b/CHANGES
index 56dbd992b9..aba9093b7b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5088.	[bug]		dig/host/nslookup could crash when interrupted close to
+			a query timeout. [GL #599]
+
 5087.	[test]		Check that result tables are complete. [GL #676]
 
 5086.	[func]		Log of RPZ now includes the QTYPE and QCLASS. [GL #623]
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index f4e5e55ae6..410b63435b 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -2902,6 +2902,11 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
 
 	INSIST(!free_now);
 
+	if (cancel_now) {
+		UNLOCK_LOOKUP;
+		return;
+	}
+
 	if ((query != NULL) && (query->lookup->current_query != NULL) &&
 	    ISC_LINK_LINKED(query->lookup->current_query, link) &&
 	    (ISC_LIST_NEXT(query->lookup->current_query, link) != NULL)) {