@@ -31,12 +31,12 @@
 
 - init
 {
 	Class c = isa;
 	[self release];
-	@throw [OFNotImplementedException newWithClass: c
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
 }
 
 - initWithProxyHost: (OFString*)host
 	       port: (uint16_t)port
 {
@@ -77,14 +77,15 @@
 	[self readExactlyNBytes: 2
 		     intoBuffer: reply];
 
 	if (reply[0] != 5 || reply[1] != 0) {
 		[self close];
-		@throw [OFConnectionFailedException newWithClass: isa
-							  socket: self
-							    host: proxyHost
-							    port: proxyPort];
+		@throw [OFConnectionFailedException
+		    exceptionWithClass: isa
+				socket: self
+				  host: proxyHost
+				  port: proxyPort];
 	}
 
 	oldBuffersWrites = [self buffersWrites];
 	[self setBuffersWrites: YES];
 
@@ -105,14 +106,14 @@
 	[self readExactlyNBytes: 4
 		     intoBuffer: reply];
 
 	if (reply[0] != 5 || reply[1] != 0 || reply[2] != 0) {
 		[self close];
-		@throw [OFConnectionFailedException newWithClass: isa
-							  socket: self
-							    host: host
-							    port: port];
+		@throw [OFConnectionFailedException exceptionWithClass: isa
+								socket: self
+								  host: host
+								  port: port];
 	}
 
 	/* Skip the rest of the reply */
 	switch (reply[3]) {
 	case 1: /* IPv4 */
@@ -127,14 +128,14 @@
 		[self readExactlyNBytes: 16
 			     intoBuffer: reply];
 		break;
 	default:
 		[self close];
-		@throw [OFConnectionFailedException newWithClass: isa
-							  socket: self
-							    host: host
-							    port: port];
+		@throw [OFConnectionFailedException exceptionWithClass: isa
+								socket: self
+								  host: host
+								  port: port];
 	}
 
 	[self readBigEndianInt16];
 }
 @end