@@ -42,11 +42,11 @@
 #import "OFString.h"
 #import "OFTCPSocketSOCKS5Connector.h"
 #import "OFThread.h"
 
 #import "OFAlreadyConnectedException.h"
-#import "OFBindFailedException.h"
+#import "OFBindSocketFailedException.h"
 #import "OFGetOptionFailedException.h"
 #import "OFNotImplementedException.h"
 #import "OFNotOpenException.h"
 #import "OFSetOptionFailedException.h"
 
@@ -314,11 +314,11 @@
 	OFSocketAddressSetPort(&address, port);
 
 	if ((_socket = socket(
 	    ((struct sockaddr *)&address.sockaddr)->sa_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle)
-		@throw [OFBindFailedException
+		@throw [OFBindSocketFailedException
 		    exceptionWithHost: host
 				 port: port
 			       socket: self
 				errNo: OFSocketErrNo()];
 
@@ -340,14 +340,15 @@
 			int errNo = OFSocketErrNo();
 
 			closesocket(_socket);
 			_socket = OFInvalidSocketHandle;
 
-			@throw [OFBindFailedException exceptionWithHost: host
-								   port: port
-								 socket: self
-								  errNo: errNo];
+			@throw [OFBindSocketFailedException
+			    exceptionWithHost: host
+					 port: port
+				       socket: self
+					errNo: errNo];
 		}
 #if defined(OF_HPUX) || defined(OF_WII) || defined(OF_NINTENDO_3DS)
 	} else {
 		for (;;) {
 			uint16_t rnd = 0;
@@ -369,11 +370,11 @@
 				int errNo = OFSocketErrNo();
 
 				closesocket(_socket);
 				_socket = OFInvalidSocketHandle;
 
-				@throw [OFBindFailedException
+				@throw [OFBindSocketFailedException
 				    exceptionWithHost: host
 						 port: port
 					       socket: self
 						errNo: errNo];
 			}
@@ -395,14 +396,14 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithHost: host
-							   port: port
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindSocketFailedException exceptionWithHost: host
+								 port: port
+							       socket: self
+								errNo: errNo];
 	}
 
 	switch (((struct sockaddr *)&address.sockaddr)->sa_family) {
 	case AF_INET:
 		return OFFromBigEndian16(address.sockaddr.in.sin_port);
@@ -412,22 +413,23 @@
 # endif
 	default:
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithHost: host
-							   port: port
-							 socket: self
-							  errNo: EAFNOSUPPORT];
+		@throw [OFBindSocketFailedException
+		    exceptionWithHost: host
+				 port: port
+			       socket: self
+				errNo: EAFNOSUPPORT];
 	}
 #else
 	closesocket(_socket);
 	_socket = OFInvalidSocketHandle;
-	@throw [OFBindFailedException exceptionWithHost: host
-						   port: port
-						 socket: self
-						  errNo: EADDRNOTAVAIL];
+	@throw [OFBindSocketFailedException exceptionWithHost: host
+							 port: port
+						       socket: self
+							errNo: EADDRNOTAVAIL];
 #endif
 }
 
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 - (void)setSendsKeepAlives: (bool)sendsKeepAlives