@@ -76,11 +76,11 @@
 	SEL _selector;
 	id _context;
 # ifdef OF_HAVE_BLOCKS
 	of_tcp_socket_async_connect_block_t _block;
 # endif
-	OFException *_exception;
+	id _exception;
 }
 
 - initWithSourceThread: (OFThread *)sourceThread
 		socket: (OFTCPSocket *)socket
 		  host: (OFString *)host
@@ -170,12 +170,12 @@
 # ifdef OF_HAVE_BLOCKS
 	if (_block != NULL)
 		_block(_socket, _exception);
 	else {
 # endif
-		void (*func)(id, SEL, OFTCPSocket *, id, OFException *) =
-		    (void (*)(id, SEL, OFTCPSocket *, id, OFException *))
+		void (*func)(id, SEL, OFTCPSocket *, id, id) =
+		    (void (*)(id, SEL, OFTCPSocket *, id, id))
 		    [_target methodForSelector: _selector];
 
 		func(_target, _selector, _socket, _context, _exception);
 # ifdef OF_HAVE_BLOCKS
 	}
@@ -187,11 +187,11 @@
 	void *pool = objc_autoreleasePoolPush();
 
 	@try {
 		[_socket connectToHost: _host
 				  port: _port];
-	} @catch (OFException *e) {
+	} @catch (id e) {
 		_exception = [e retain];
 	}
 
 	[self performSelector: @selector(didConnect)
 		     onThread: _sourceThread