@@ -54,11 +54,11 @@
 	id _context;
 # ifdef OF_HAVE_BLOCKS
 	of_udp_socket_async_resolve_block_t _block;
 # endif
 	of_udp_socket_address_t _address;
-	OFException *_exception;
+	id _exception;
 }
 
 - initWithSourceThread: (OFThread *)sourceThread
 		  host: (OFString *)host
 		  port: (uint16_t)port
@@ -142,13 +142,13 @@
 	if (_block != NULL)
 		_block(_host, _port, _address, _exception);
 	else {
 # endif
 		void (*func)(id, SEL, OFString *, uint16_t,
-		    of_udp_socket_address_t, id, OFException *) =
+		    of_udp_socket_address_t, id, id) =
 		    (void (*)(id, SEL, OFString *, uint16_t,
-		    of_udp_socket_address_t, id, OFException *))
+		    of_udp_socket_address_t, id, id))
 		    [_target methodForSelector: _selector];
 
 		func(_target, _selector, _host, _port, _address, _context,
 		    _exception);
 # ifdef OF_HAVE_BLOCKS
@@ -162,11 +162,11 @@
 
 	@try {
 		[OFUDPSocket resolveAddressForHost: _host
 					      port: _port
 					   address: &_address];
-	} @catch (OFException *e) {
+	} @catch (id e) {
 		_exception = e;
 	}
 
 	[self performSelector: @selector(didResolve)
 		     onThread: _sourceThread