@@ -216,12 +216,11 @@
 
 - initWithObject: (id)object
 	  forKey: (id)key
 {
 	if (key == nil || object == nil)
-		@throw [OFInvalidArgumentException
-		    exceptionWithClass: [self class]];
+		@throw [OFInvalidArgumentException exception];
 
 	return [self initWithKeysAndObjects: key, object, nil];
 }
 
 - initWithObjects: (OFArray*)objects_
@@ -232,12 +231,11 @@
 
 	@try {
 		count = [objects_ count];
 
 		if (count != [keys_ count])
-			@throw [OFInvalidArgumentException
-			    exceptionWithClass: [self class]];
+			@throw [OFInvalidArgumentException exception];
 
 		objects = [objects_ objects];
 		keys = [keys_ objects];
 	} @catch (id e) {
 		[self release];
@@ -673,11 +671,11 @@
 
 		[data addItem: &type];
 		[data addItems: &tmp
 			 count: sizeof(tmp)];
 	} else
-		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
+		@throw [OFOutOfRangeException exception];
 
 	pool = objc_autoreleasePoolPush();
 
 	i = 0;
 	keyEnumerator = [self keyEnumerator];