@@ -45,12 +45,13 @@
 
 	pool = [[OFAutoreleasePool alloc] init];
 
 	if (![[element name] isEqual: [self className]] ||
 	    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
-		@throw [OFInvalidArgumentException exceptionWithClass: isa
-							     selector: _cmd];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]
+			      selector: _cmd];
 
 	[pool release];
 
 	return [OFNull null];
 }
@@ -104,10 +105,10 @@
 	return OF_RETAIN_COUNT_MAX;
 }
 
 - (void)dealloc
 {
-	@throw [OFNotImplementedException exceptionWithClass: isa
+	@throw [OFNotImplementedException exceptionWithClass: [self class]
 						    selector: _cmd];
 	[super dealloc];	/* Get rid of a stupid warning */
 }
 @end