@@ -22,11 +22,11 @@
 #import "OFRunLoop+Private.h"
 #import "OFSocket.h"
 #import "OFSocket+Private.h"
 
 #import "OFAlreadyConnectedException.h"
-#import "OFBindFailedException.h"
+#import "OFBindSocketFailedException.h"
 #import "OFConnectionFailedException.h"
 #import "OFNotOpenException.h"
 
 #ifndef NSPROTO_SPX
 # define NSPROTO_SPX 0
@@ -327,11 +327,11 @@
 	address = OFSocketAddressMakeIPX(0, zeroNode, port);
 
 	if ((_socket = socket(address.sockaddr.ipx.sipx_family,
 	    SOCK_SEQPACKET | SOCK_CLOEXEC, NSPROTO_SPX)) ==
 	    OFInvalidSocketHandle)
-		@throw [OFBindFailedException
+		@throw [OFBindSocketFailedException
 		    exceptionWithPort: port
 			   packetType: SPXPacketType
 			       socket: self
 				errNo: OFSocketErrNo()];
 
@@ -347,14 +347,15 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithPort: port
-						     packetType: SPXPacketType
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindSocketFailedException
+		    exceptionWithPort: port
+			   packetType: SPXPacketType
+			       socket: self
+				errNo: errNo];
 	}
 
 	memset(&address, 0, sizeof(address));
 	address.family = OFSocketAddressFamilyIPX;
 	address.length = (socklen_t)sizeof(address.sockaddr);
@@ -364,24 +365,26 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithPort: port
-						     packetType: SPXPacketType
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindSocketFailedException
+		    exceptionWithPort: port
+			   packetType: SPXPacketType
+			       socket: self
+				errNo: errNo];
 	}
 
 	if (address.sockaddr.ipx.sipx_family != AF_IPX) {
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithPort: port
-						     packetType: SPXPacketType
-							 socket: self
-							  errNo: EAFNOSUPPORT];
+		@throw [OFBindSocketFailedException
+		    exceptionWithPort: port
+			   packetType: SPXPacketType
+			       socket: self
+				errNo: EAFNOSUPPORT];
 	}
 
 	return address;
 }
 @end