@@ -42,13 +42,10 @@
 #import "OFTimer.h"
 #import "OFTimer+Private.h"
 #import "OFDate.h"
 
 #import "OFObserveFailedException.h"
-#ifdef OF_HAVE_SOCKETS
-# import "OFConnectionFailedException.h"
-#endif
 
 of_run_loop_mode_t of_run_loop_mode_default = @"of_run_loop_mode_default";
 static OFRunLoop *mainRunLoop = nil;
 
 @interface OFRunLoopState: OFObject
@@ -718,15 +715,12 @@
 {
 	id exception = nil;
 	int errNo;
 
 	if ((errNo = [object of_socketError]) != 0)
-		exception = [OFConnectionFailedException
-		    exceptionWithHost: nil
-				 port: 0
-			       socket: object
-				errNo: errNo];
+		exception =
+		    [_delegate of_connectionFailedExceptionForErrNo: errNo];
 
 	if ([_delegate respondsToSelector:
 	    @selector(of_socketDidConnect:exception:)]) {
 		/*
 		 * Make sure we only call the delegate once we removed the