@@ -38,22 +38,25 @@
 	id object;
 
 	@try {
 		root = [OFXMLElement elementWithXMLString: self];
 	} @catch (OFMalformedXMLException *e) {
-		@throw [OFInvalidArgumentException exceptionWithClass: isa
-							     selector: _cmd];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]
+			      selector: _cmd];
 	} @catch (OFUnboundNamespaceException *e) {
-		@throw [OFInvalidArgumentException exceptionWithClass: isa
-							     selector: _cmd];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]
+			      selector: _cmd];
 	}
 
 	elements = [root elementsForNamespace: OF_SERIALIZATION_NS];
 
 	if ([elements count] != 1)
-		@throw [OFInvalidArgumentException exceptionWithClass: isa
-							     selector: _cmd];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]
+			      selector: _cmd];
 
 	object = [[elements firstObject] objectByDeserializing];
 
 	[object retain];
 	[pool release];