@@ -13,106 +13,36 @@
  * file.
  */
 
 #include "config.h"
 
-#import "OFBindFailedException.h"
+#import "OFBindSocketFailedException.h"
 #import "OFString.h"
 
-@implementation OFBindFailedException
-@synthesize host = _host, port = _port, packetType = _packetType, path = _path;
+@implementation OFBindSocketFailedException
 @synthesize socket = _socket, errNo = _errNo;
 
 + (instancetype)exception
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-+ (instancetype)exceptionWithHost: (OFString *)host
-			     port: (uint16_t)port
-			   socket: (id)sock
-			    errNo: (int)errNo
-{
-	return [[[self alloc] initWithHost: host
-				      port: port
-				    socket: sock
-				     errNo: errNo] autorelease];
-}
-
-+ (instancetype)exceptionWithPort: (uint16_t)port
-		       packetType: (uint8_t)packetType
-			   socket: (id)sock
-			    errNo: (int)errNo
-{
-	return [[[self alloc] initWithPort: port
-				packetType: packetType
-				    socket: sock
-				     errNo: errNo] autorelease];
-}
-
-+ (instancetype)exceptionWithPath: (OFString *)path
-			   socket: (id)sock
-			    errNo: (int)errNo
-{
-	return [[[self alloc] initWithPath: path
-				    socket: sock
-				     errNo: errNo] autorelease];
++ (instancetype)exceptionWithSocket: (id)sock errNo: (int)errNo
+{
+	return [[[self alloc] initWithSocket: sock errNo: errNo] autorelease];
 }
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithHost: (OFString *)host
-			port: (uint16_t)port
-		      socket: (id)sock
-		       errNo: (int)errNo
-{
-	self = [super init];
-
-	@try {
-		_host = [host copy];
-		_port = port;
-		_socket = [sock retain];
-		_errNo = errNo;
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
-
-	return self;
-}
-
-- (instancetype)initWithPort: (uint16_t)port
-		  packetType: (uint8_t)packetType
-		      socket: (id)sock
-		       errNo: (int)errNo
-{
-	self = [super init];
-
-	@try {
-		_port = port;
-		_packetType = packetType;
-		_socket = [sock retain];
-		_errNo = errNo;
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
-
-	return self;
-}
-
-- (instancetype)initWithPath: (OFString *)path
-		      socket: (id)sock
-		       errNo: (int)errNo
-{
-	self = [super init];
-
-	@try {
-		_path = [path copy];
+- (instancetype)initWithSocket: (id)sock errNo: (int)errNo
+{
+	self = [super init];
+
+	@try {
 		_socket = [sock retain];
 		_errNo = errNo;
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -121,30 +51,17 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[_host release];
-	[_path release];
 	[_socket release];
 
 	[super dealloc];
 }
 
 - (OFString *)description
 {
-	if (_path != nil)
-		return [OFString stringWithFormat:
-		    @"Binding to path %@ failed in socket of type %@: %@",
-		    _path, [_socket class], OFStrError(_errNo)];
-	else if (_host != nil)
-		return [OFString stringWithFormat:
-		    @"Binding to port %" @PRIu16 @" on host %@ failed in "
-		    @"socket of type %@: %@",
-		    _port, _host, [_socket class], OFStrError(_errNo)];
-	else
-		return [OFString stringWithFormat:
-		    @"Binding to port %" @PRIx16 @" for packet type %" @PRIx8
-		    @" failed in socket of type %@: %@",
-		    _port, _packetType, [_socket class], OFStrError(_errNo)];
+	return [OFString stringWithFormat:
+	    @"Binding a socket of type %@ failed: %@",
+	    [_socket class], OFStrError(_errNo)];
 }
 @end