@@ -39,11 +39,12 @@
 {
 	if (self != [OFAutoreleasePool class])
 		return;
 
 	if (!of_tlskey_new(&firstKey) || !of_tlskey_new(&lastKey))
-		@throw [OFInitializationFailedException newWithClass: self];
+		@throw [OFInitializationFailedException
+		    exceptionWithClass: self];
 }
 #endif
 
 + (void)addObject: (id)object
 {
@@ -64,11 +65,12 @@
 #endif
 	}
 
 	if (lastPool == nil) {
 		[object release];
-		@throw [OFInitializationFailedException newWithClass: self];
+		@throw [OFInitializationFailedException
+		    exceptionWithClass: self];
 	}
 
 	@try {
 		[lastPool _addObject: object];
 	} @catch (id e) {
@@ -95,11 +97,11 @@
 		id firstPool = of_tlskey_get(firstKey);
 		previousPool = of_tlskey_get(lastKey);
 
 		if (!of_tlskey_set(lastKey, self))
 			@throw [OFInitializationFailedException
-			    newWithClass: isa];
+			    exceptionWithClass: isa];
 #else
 		previousPool = lastPool;
 		lastPool = self;
 #endif
 
@@ -106,11 +108,11 @@
 		if (firstPool == nil) {
 #ifdef OF_THREADS
 			if (!of_tlskey_set(firstKey, self)) {
 				of_tlskey_set(lastKey, previousPool);
 				@throw [OFInitializationFailedException
-				    newWithClass: isa];
+				    exceptionWithClass: isa];
 			}
 #else
 			firstPool = self;
 #endif
 		}
@@ -207,15 +209,15 @@
 	[super dealloc];
 }
 
 - retain
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - autorelease
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 @end