@@ -124,12 +124,13 @@
 		OFEnumerator *enumerator;
 		OFXMLElement *objectElement;
 
 		if (![[element name] isEqual: @"OFCountedSet"] ||
 		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
-			@throw [OFInvalidArgumentException newWithClass: isa
-							       selector: _cmd];
+			@throw [OFInvalidArgumentException
+			    exceptionWithClass: isa
+				      selector: _cmd];
 
 		objects = [element elementsForName: @"object"
 					 namespace: OF_SERIALIZATION_NS];
 
 		enumerator = [objects objectEnumerator];
@@ -144,11 +145,11 @@
 			    OF_SERIALIZATION_NS] firstObject];
 			count = [objectElement attributeForName: @"count"];
 
 			if (object == nil || count == nil)
 				@throw [OFInvalidFormatException
-				    newWithClass: isa];
+				    exceptionWithClass: isa];
 
 			number = [OFNumber numberWithSize:
 			    (size_t)[[count stringValue] decimalValue]];
 
 			[dictionary _setObject: number