@@ -19,11 +19,12 @@
 
 #import "OFConnectionFailedException.h"
 #import "OFString.h"
 
 @implementation OFConnectionFailedException
-@synthesize host = _host, port = _port, socket = _socket, errNo = _errNo;
+@synthesize host = _host, port = _port, network = _network, socket = _socket;
+@synthesize errNo = _errNo;
 
 + (instancetype)exception
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
@@ -33,10 +34,23 @@
 			   socket: (id)socket
 			    errNo: (int)errNo
 {
 	return [[[self alloc] initWithHost: host
 				      port: port
+				    socket: socket
+				     errNo: errNo] autorelease];
+}
+
++ (instancetype)exceptionWithNode: (unsigned char [IPX_NODE_LEN])node
+			  network: (uint32_t)network
+			     port: (uint16_t)port
+			   socket: (id)socket
+			    errNo: (int)errNo
+{
+	return [[[self alloc] initWithNode: node
+				   network: network
+				      port: port
 				    socket: socket
 				     errNo: errNo] autorelease];
 }
 
 - (instancetype)init
@@ -51,12 +65,34 @@
 {
 	self = [super init];
 
 	@try {
 		_host = [host copy];
+		_port = port;
 		_socket = [socket retain];
+		_errNo = errNo;
+	} @catch (id e) {
+		[self release];
+		@throw e;
+	}
+
+	return self;
+}
+
+- (instancetype)initWithNode: (unsigned char [IPX_NODE_LEN])node
+		     network: (uint32_t)network
+			port: (uint16_t)port
+		      socket: (id)socket
+		       errNo: (int)errNo
+{
+	self = [super init];
+
+	@try {
+		memcpy(_node, node, IPX_NODE_LEN);
+		_network = network;
 		_port = port;
+		_socket = [socket retain];
 		_errNo = errNo;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
@@ -69,20 +105,32 @@
 	[_host release];
 	[_socket release];
 
 	[super dealloc];
 }
+
+- (unsigned char *)node
+{
+	return _node;
+}
 
 - (OFString *)description
 {
 	if (_host != nil)
 		return [OFString stringWithFormat:
 		    @"A connection to %@ on port %" @PRIu16 @" could not be "
 		    @"established in socket of type %@: %@",
 		    _host, _port, [_socket class], of_strerror(_errNo)];
+	else if (memcmp(_node, "\0\0\0\0\0", IPX_NODE_LEN) == 0)
+		return [OFString stringWithFormat:
+		    @"A connection to %02X%02X%02X%02X%02X%02X port %" @PRIu16
+		    @" on network %" @PRIX32 " could not be established in "
+		    @"socket of type %@: %@",
+		    _node[0], _node[1], _node[2], _node[3], _node[4], _node[5],
+		    _port, _network, [_socket class], of_strerror(_errNo)];
 	else
 		return [OFString stringWithFormat:
 		    @"A connection could not be established in socket of "
 		    @"type %@: %@",
 		    [_socket class], of_strerror(_errNo)];
 }
 @end