@@ -99,11 +99,11 @@
 	@try {
 		char *tmp, *tmp2;
 
 		if ((UTF8String2 = strdup([string UTF8String])) == NULL)
 			@throw [OFOutOfMemoryException
-			     exceptionWithClass: isa
+			     exceptionWithClass: [self class]
 				  requestedSize: [string UTF8StringLength]];
 
 		UTF8String = UTF8String2;
 
 		if (!strncmp(UTF8String, "file://", 7)) {
@@ -117,11 +117,11 @@
 		} else if (!strncmp(UTF8String, "https://", 8)) {
 			scheme = @"https";
 			UTF8String += 8;
 		} else
 			@throw [OFInvalidFormatException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 
 		if ((tmp = strchr(UTF8String, '/')) != NULL) {
 			*tmp = '\0';
 			tmp++;
 		}
@@ -160,11 +160,11 @@
 			pool = [[OFAutoreleasePool alloc] init];
 			portString = [OFString stringWithUTF8String: tmp2];
 
 			if ([portString decimalValue] > 65535)
 				@throw [OFInvalidFormatException
-				    exceptionWithClass: isa];
+				    exceptionWithClass: [self class]];
 
 			port = [portString decimalValue];
 
 			[pool release];
 		} else {
@@ -234,11 +234,11 @@
 		user = [URL->user copy];
 		password = [URL->password copy];
 
 		if ((UTF8String2 = strdup([string UTF8String])) == NULL)
 			@throw [OFOutOfMemoryException
-			     exceptionWithClass: isa
+			     exceptionWithClass: [self class]
 				  requestedSize: [string UTF8StringLength]];
 
 		UTF8String = UTF8String2;
 
 		if ((tmp = strchr(UTF8String, '#')) != NULL) {
@@ -296,11 +296,11 @@
 		OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 
 		if (![[element name] isEqual: [self className]] ||
 		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
 			@throw [OFInvalidArgumentException
-			    exceptionWithClass: isa
+			    exceptionWithClass: [self class]
 				      selector: _cmd];
 
 		self = [self initWithString: [element stringValue]];
 
 		[pool release];
@@ -383,11 +383,11 @@
 	return hash;
 }
 
 - copy
 {
-	OFURL *copy = [[isa alloc] init];
+	OFURL *copy = [[[self class] alloc] init];
 
 	@try {
 		copy->scheme = [scheme copy];
 		copy->host = [host copy];
 		copy->port = port;
@@ -411,12 +411,13 @@
 }
 
 - (void)setScheme: (OFString*)scheme_
 {
 	if (![scheme_ isEqual: @"http"] && ![scheme_ isEqual: @"https"])
-		@throw [OFInvalidArgumentException exceptionWithClass: isa
-							     selector: _cmd];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]
+			      selector: _cmd];
 
 	OF_SETTER(scheme, scheme_, YES, 1)
 }
 
 - (OFString*)host
@@ -466,12 +467,13 @@
 
 - (void)setPath: (OFString*)path_
 {
 	if (([scheme isEqual: @"http"] || [scheme isEqual: @"https"]) &&
 	    ![path_ hasPrefix: @"/"])
-		@throw [OFInvalidArgumentException exceptionWithClass: isa
-							     selector: _cmd];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]
+			      selector: _cmd];
 
 	OF_SETTER(path, path_, YES, 1)
 }
 
 - (OFString*)parameters