@@ -239,10 +239,17 @@
 	[_addresses makeImmutable];
 
 	if (_addresses.count == 0) {
 		[_addresses release];
 		_addresses = nil;
+
+		if ([exception isKindOfClass:
+		    [OFDNSQueryFailedException class]])
+			exception = [OFResolveHostFailedException
+			    exceptionWithHost: _host
+				addressFamily: _addressFamily
+					error: [exception error]];
 
 		if (exception == nil)
 			exception = [OFResolveHostFailedException
 			    exceptionWithHost: _host
 				addressFamily: _addressFamily