@@ -23,12 +23,12 @@
 #import "OFSocket.h"
 #import "OFSocket+Private.h"
 #import "OFString.h"
 
 #import "OFAlreadyConnectedException.h"
-#import "OFBindFailedException.h"
-#import "OFConnectionFailedException.h"
+#import "OFBindUNIXSocketFailedException.h"
+#import "OFConnectUNIXSocketFailedException.h"
 
 @implementation OFUNIXStreamSocket
 @dynamic delegate;
 
 - (void)connectToPath: (OFString *)path
@@ -43,11 +43,11 @@
 
 	address = OFSocketAddressMakeUNIX(path);
 
 	if ((_socket = socket(address.sockaddr.un.sun_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle)
-		@throw [OFConnectionFailedException
+		@throw [OFConnectUNIXSocketFailedException
 		    exceptionWithPath: path
 			       socket: self
 				errNo: OFSocketErrNo()];
 
 	_canBlock = true;
@@ -62,13 +62,14 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFConnectionFailedException exceptionWithPath: path
-							       socket: self
-								errNo: errNo];
+		@throw [OFConnectUNIXSocketFailedException
+		    exceptionWithPath: path
+			       socket: self
+				errNo: errNo];
 	}
 }
 
 - (void)bindToPath: (OFString *)path
 {
@@ -82,11 +83,11 @@
 
 	address = OFSocketAddressMakeUNIX(path);
 
 	if ((_socket = socket(address.sockaddr.un.sun_family,
 	    SOCK_STREAM | SOCK_CLOEXEC, 0)) == OFInvalidSocketHandle)
-		@throw [OFBindFailedException
+		@throw [OFBindUNIXSocketFailedException
 		    exceptionWithPath: path
 			       socket: self
 				errNo: OFSocketErrNo()];
 
 	_canBlock = true;
@@ -101,11 +102,12 @@
 		int errNo = OFSocketErrNo();
 
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
-		@throw [OFBindFailedException exceptionWithPath: path
-							 socket: self
-							  errNo: errNo];
+		@throw [OFBindUNIXSocketFailedException
+		    exceptionWithPath: path
+			       socket: self
+				errNo: errNo];
 	}
 }
 @end