@@ -39,12 +39,12 @@
 #import "OFBindFailedException.h"
 #import "OFConnectionFailedException.h"
 #import "OFGetOptionFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFListenFailedException.h"
-#import "OFNotConnectedException.h"
 #import "OFNotImplementedException.h"
+#import "OFNotOpenException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFSetOptionFailedException.h"
 
 #import "socket.h"
 #import "socket_helpers.h"
@@ -481,11 +481,11 @@
 }
 
 - (void)listenWithBackLog: (int)backLog
 {
 	if (_socket == INVALID_SOCKET)
-		@throw [OFNotConnectedException exceptionWithSocket: self];
+		@throw [OFNotOpenException exceptionWithObject: self];
 
 	if (listen(_socket, backLog) == -1)
 		@throw [OFListenFailedException
 		    exceptionWithSocket: self
 				backLog: backLog
@@ -566,11 +566,11 @@
 - (OFString*)remoteAddress
 {
 	OFString *ret;
 
 	if (_socket == INVALID_SOCKET)
-		@throw [OFNotConnectedException exceptionWithSocket: self];
+		@throw [OFNotOpenException exceptionWithObject: self];
 
 	if (_address == NULL)
 		@throw [OFInvalidArgumentException exception];
 
 	of_address_to_string_and_port(_address, _addressLength, &ret, NULL);