@@ -51,12 +51,10 @@
 #import "OFSetOptionFailedException.h"
 
 static const OFRunLoopMode connectRunLoopMode =
     @"OFTCPSocketConnectRunLoopMode";
 
-Class OFTLSSocketClass = Nil;
-
 static OFString *defaultSOCKS5Host = nil;
 static uint16_t defaultSOCKS5Port = 1080;
 
 @interface OFTCPSocket () <OFIPSocketAsyncConnecting>
 @end
@@ -187,26 +185,26 @@
 	id <OFTCPSocketDelegate> delegate = _delegate;
 	OFTCPSocketConnectDelegate *connectDelegate =
 	    [[[OFTCPSocketConnectDelegate alloc] init] autorelease];
 	OFRunLoop *runLoop = [OFRunLoop currentRunLoop];
 
-	self.delegate = connectDelegate;
+	_delegate = connectDelegate;
 	[self asyncConnectToHost: host
 			    port: port
 		     runLoopMode: connectRunLoopMode];
 
 	while (!connectDelegate->_done)
 		[runLoop runMode: connectRunLoopMode beforeDate: nil];
 
 	/* Cleanup */
 	[runLoop runMode: connectRunLoopMode beforeDate: [OFDate date]];
+
+	_delegate = delegate;
 
 	if (connectDelegate->_exception != nil)
 		@throw connectDelegate->_exception;
 
-	self.delegate = delegate;
-
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)asyncConnectToHost: (OFString *)host port: (uint16_t)port
 {