@@ -143,12 +143,11 @@
 	uint8_t *tmp = (uint8_t*)cString;
 	bool firstLetter = true;
 
 	if (cString == NULL)
 		@throw [OFOutOfMemoryException
-		    exceptionWithClass: nil
-			 requestedSize: strlen([key UTF8String])];
+		    exceptionWithRequestedSize: strlen([key UTF8String])];
 
 	while (*tmp != '\0') {
 		if (!isalnum(*tmp)) {
 			firstLetter = true;
 			tmp++;
@@ -688,18 +687,14 @@
 }
 
 - (void)start
 {
 	if (_host == nil || _port == 0)
-		@throw [OFInvalidArgumentException
-		    exceptionWithClass: [self class]
-			      selector: _cmd];
+		@throw [OFInvalidArgumentException exception];
 
 	if (_listeningSocket != nil)
-		@throw [OFAlreadyConnectedException
-		    exceptionWithClass: [self class]
-				socket: _listeningSocket];
+		@throw [OFAlreadyConnectedException exception];
 
 	_listeningSocket = [[OFTCPSocket alloc] init];
 	[_listeningSocket bindToHost: _host
 				port: _port];
 	[_listeningSocket listen];