@@ -45,12 +45,13 @@
 		OFEnumerator *enumerator;
 		OFXMLElement *child;
 
 		if (![[element name] isEqual: [self className]] ||
 		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
-			@throw [OFInvalidArgumentException newWithClass: isa
-							       selector: _cmd];
+			@throw [OFInvalidArgumentException
+			    exceptionWithClass: isa
+				      selector: _cmd];
 
 		enumerator = [[element children] objectEnumerator];
 		pool2 = [[OFAutoreleasePool alloc] init];
 
 		while ((child = [enumerator nextObject]) != nil) {
@@ -441,12 +442,13 @@
 - (id)nextObject
 {
 	id ret;
 
 	if (*mutationsPtr != mutations)
-		@throw [OFEnumerationMutationException newWithClass: isa
-							     object: list];
+		@throw [OFEnumerationMutationException
+		    exceptionWithClass: isa
+				object: list];
 
 	if (current == NULL)
 		return nil;
 
 	ret = current->object;
@@ -456,10 +458,12 @@
 }
 
 - (void)reset
 {
 	if (*mutationsPtr != mutations)
-		@throw [OFEnumerationMutationException newWithClass: isa];
+		@throw [OFEnumerationMutationException
+		    exceptionWithClass: isa
+				object: list];
 
 	current = [list firstListObject];
 }
 @end