@@ -908,11 +908,12 @@
 		return true;
 
 	if (context->_TCPSocket != nil) {
 		if ([_TCPQueries objectForKey: context->_TCPSocket] != context)
 			return true;
-	} else if (!OFSocketAddressEqual(sender, &context->_usedNameServer))
+	} else if (sender == NULL ||
+	    !OFSocketAddressEqual(sender, &context->_usedNameServer))
 		return true;
 
 	[context->_cancelTimer invalidate];
 	[context->_cancelTimer release];
 	context->_cancelTimer = nil;