@@ -41,11 +41,11 @@
 	 * Oh, and we can't use [self allocWithSize:] here as self might be a
 	 * @"" literal.
 	 */
 	if ((retCString = malloc(([self UTF8StringLength] * 3) + 1)) == NULL)
 		@throw [OFOutOfMemoryException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			 requestedSize: ([self UTF8StringLength] * 3) + 1];
 
 	for (i = 0; *string != '\0'; string++) {
 		if (isalnum((int)*string) || *string == '-' || *string == '_' ||
 		    *string == '.' || *string == '~')
@@ -83,11 +83,11 @@
 	int state = 0;
 	size_t i;
 
 	if ((retCString = malloc([self UTF8StringLength] + 1)) == NULL)
 		@throw [OFOutOfMemoryException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			 requestedSize: [self UTF8StringLength] + 1];
 
 	for (i = 0; *string; string++) {
 		switch (state) {
 		case 0:
@@ -109,11 +109,11 @@
 			else if (*string >= 'a' && *string <= 'f')
 				byte += (*string - 'a' + 10) << shift;
 			else {
 				free(retCString);
 				@throw [OFInvalidEncodingException
-				    exceptionWithClass: isa];
+				    exceptionWithClass: [self class]];
 			}
 
 			if (++state == 3) {
 				retCString[i++] = byte;
 				state = 0;
@@ -125,11 +125,12 @@
 	}
 	retCString[i] = '\0';
 
 	if (state != 0) {
 		free(retCString);
-		@throw [OFInvalidEncodingException exceptionWithClass: isa];
+		@throw [OFInvalidEncodingException
+		    exceptionWithClass: [self class]];
 	}
 
 	@try {
 		ret = [OFString stringWithUTF8String: retCString
 					      length: i];