@@ -101,12 +101,12 @@
 {
 }
 
 - (void)dealloc
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 	[super dealloc];	/* Get rid of a stupid warning */
 }
 @end
 
 @implementation OFMutableArray
@@ -127,12 +127,12 @@
 - init
 {
 	if (isa == [OFMutableArray class]) {
 		Class c = isa;
 		[self release];
-		@throw [OFNotImplementedException newWithClass: c
-						      selector: _cmd];
+		@throw [OFNotImplementedException exceptionWithClass: c
+							    selector: _cmd];
 	}
 
 	return [super init];
 }
 
@@ -148,19 +148,19 @@
 }
 
 - (void)addObject: (id)object
 	  atIndex: (size_t)index
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)replaceObjectAtIndex: (size_t)index
 		  withObject: (id)object
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)replaceObject: (id)oldObject
 	   withObject: (id)newObject
 {
@@ -190,12 +190,12 @@
 	}
 }
 
 - (void)removeObjectAtIndex: (size_t)index
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)removeObject: (id)object
 {
 	size_t i, count = [self count];