@@ -103,12 +103,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 OFArray
@@ -169,12 +169,12 @@
 - init
 {
 	if (isa == [OFArray class]) {
 		Class c = isa;
 		[self release];
-		@throw [OFNotImplementedException newWithClass: c
-						      selector: _cmd];
+		@throw [OFNotImplementedException exceptionWithClass: c
+							    selector: _cmd];
 	}
 
 	return [super init];
 }
 
@@ -199,51 +199,51 @@
 - initWithObject: (id)firstObject
        arguments: (va_list)arguments
 {
 	Class c = isa;
 	[self release];
-	@throw [OFNotImplementedException newWithClass: c
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
 }
 
 - initWithArray: (OFArray*)array
 {
 	Class c = isa;
 	[self release];
-	@throw [OFNotImplementedException newWithClass: c
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
 }
 
 - initWithCArray: (id*)objects
 {
 	Class c = isa;
 	[self release];
-	@throw [OFNotImplementedException newWithClass: c
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
 }
 
 - initWithCArray: (id*)objects
 	  length: (size_t)length
 {
 	Class c = isa;
 	[self release];
-	@throw [OFNotImplementedException newWithClass: c
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
 }
 
 - initWithSerialization: (OFXMLElement*)element
 {
 	Class c = isa;
 	[self release];
-	@throw [OFNotImplementedException newWithClass: c
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
 }
 
 - (size_t)count
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)getObjects: (id*)buffer
 	   inRange: (of_range_t)range
 {
@@ -280,12 +280,12 @@
 	return [[OFMutableArray alloc] initWithArray: self];
 }
 
 - (id)objectAtIndex: (size_t)index
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (size_t)indexOfObject: (id)object
 {
 	size_t i, count = [self count];
@@ -529,11 +529,11 @@
 {
 	/* FIXME: Use -[getObjects:inRange:] on the passed objects */
 	size_t count = [self count];
 
 	if (count > INT_MAX)
-		@throw [OFOutOfRangeException newWithClass: isa];
+		@throw [OFOutOfRangeException exceptionWithClass: isa];
 
 	if (state->state >= count)
 		return 0;
 
 	state->state = count;
@@ -666,12 +666,13 @@
 }
 
 - (id)nextObject
 {
 	if (mutationsPtr != NULL && *mutationsPtr != mutations)
-		@throw [OFEnumerationMutationException newWithClass: isa
-							     object: array];
+		@throw [OFEnumerationMutationException
+		    exceptionWithClass: isa
+				object: array];
 
 	if (position < count)
 		return [array objectAtIndex: position++];
 
 	return nil;
@@ -678,11 +679,12 @@
 }
 
 - (void)reset
 {
 	if (mutationsPtr != NULL && *mutationsPtr != mutations)
-		@throw [OFEnumerationMutationException newWithClass: isa
-							     object: array];
+		@throw [OFEnumerationMutationException
+		    exceptionWithClass: isa
+				object: array];
 
 	position = 0;
 }
 @end