@@ -44,13 +44,11 @@
 		OFEnumerator *enumerator;
 		OFXMLElement *child;
 
 		if (![[element name] isEqual: [self className]] ||
 		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
-			@throw [OFInvalidArgumentException
-			    exceptionWithClass: [self class]
-				      selector: _cmd];
+			@throw [OFInvalidArgumentException exception];
 
 		enumerator = [[element elementsForNamespace:
 		    OF_SERIALIZATION_NS] objectEnumerator];
 		while ((child = [enumerator nextObject]) != nil) {
 			void *pool2 = objc_autoreleasePoolPush();
@@ -442,12 +440,11 @@
 {
 	id ret;
 
 	if (*_mutationsPtr != _mutations)
 		@throw [OFEnumerationMutationException
-		    exceptionWithClass: [self class]
-				object: _list];
+		    exceptionWithObject: _list];
 
 	if (_current == NULL)
 		return nil;
 
 	ret = _current->object;
@@ -458,11 +455,10 @@
 
 - (void)reset
 {
 	if (*_mutationsPtr != _mutations)
 		@throw [OFEnumerationMutationException
-		    exceptionWithClass: [self class]
-				object: _list];
+		    exceptionWithObject: _list];
 
 	_current = [_list firstListObject];
 }
 @end