@@ -23,27 +23,27 @@
 #import "OFNotImplementedException.h"
 
 #import "common.h"
 
 @implementation OFConnectionFailedException
-+ newWithClass: (Class)class_
-	socket: (OFTCPSocket*)socket
-	  host: (OFString*)host
-	  port: (uint16_t)port
-{
-	return [[self alloc] initWithClass: class_
-				    socket: socket
-				      host: host
-				      port: port];
++ exceptionWithClass: (Class)class_
+	      socket: (OFTCPSocket*)socket
+		host: (OFString*)host
+		port: (uint16_t)port
+{
+	return [[[self alloc] initWithClass: class_
+				     socket: socket
+				       host: host
+				       port: port] autorelease];
 }
 
 - initWithClass: (Class)class_
 {
 	Class c = isa;
 	[self release];
-	@throw [OFNotImplementedException newWithClass: c
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
 }
 
 - initWithClass: (Class)class_
 	 socket: (OFTCPSocket*)socket_
 	   host: (OFString*)host_