@@ -138,11 +138,11 @@
 				tmp = parse_numeric_entity(entity,
 				    entityLength);
 
 				if (tmp == nil)
 					@throw [OFInvalidEncodingException
-					    exceptionWithClass: isa];
+					    exceptionWithClass: [self class]];
 
 				[ret appendString: tmp];
 				[pool release];
 			} else if (delegate != nil) {
 				OFAutoreleasePool *pool;
@@ -156,25 +156,26 @@
 				tmp =	  [delegate string: self
 				containsUnknownEntityNamed: n];
 
 				if (tmp == nil)
 					@throw [OFInvalidEncodingException
-					    exceptionWithClass: isa];
+					    exceptionWithClass: [self class]];
 
 				[ret appendString: tmp];
 				[pool release];
 			} else
 				@throw [OFInvalidEncodingException
-				    exceptionWithClass: isa];
+				    exceptionWithClass: [self class]];
 
 			last = i + 1;
 			inEntity = NO;
 		}
 	}
 
 	if (inEntity)
-		@throw [OFInvalidEncodingException exceptionWithClass: isa];
+		@throw [OFInvalidEncodingException
+		    exceptionWithClass: [self class]];
 
 	[ret appendUTF8String: string + last
 		   withLength: i - last];
 
 	[ret makeImmutable];
@@ -240,11 +241,11 @@
 				tmp = parse_numeric_entity(entity,
 				    entityLength);
 
 				if (tmp == nil)
 					@throw [OFInvalidEncodingException
-					    exceptionWithClass: isa];
+					    exceptionWithClass: [self class]];
 
 				[ret appendString: tmp];
 				[pool release];
 			} else {
 				OFAutoreleasePool *pool;
@@ -257,11 +258,11 @@
 						  length: entityLength];
 				tmp = block(self, entityString);
 
 				if (tmp == nil)
 					@throw [OFInvalidEncodingException
-					    exceptionWithClass: isa];
+					    exceptionWithClass: [self class]];
 
 				[ret appendString: tmp];
 				[pool release];
 			}
 
@@ -269,11 +270,12 @@
 			inEntity = NO;
 		}
 	}
 
 	if (inEntity)
-		@throw [OFInvalidEncodingException exceptionWithClass: isa];
+		@throw [OFInvalidEncodingException
+		    exceptionWithClass: [self class]];
 
 	[ret appendUTF8String: string + last
 		   withLength: i - last];
 
 	[ret makeImmutable];