@@ -81,11 +81,11 @@
 
 	@try {
 #ifndef _WIN32
 		if (pipe(readPipe) != 0 || pipe(writePipe) != 0)
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 
 		switch ((pid = fork())) {
 		case 0:;
 			OFString **objects = [arguments objects];
 			size_t i, count = [arguments count];
@@ -110,14 +110,14 @@
 			dup2(readPipe[1], 1);
 			execvp([program cStringWithEncoding:
 			    OF_STRING_ENCODING_NATIVE], argv);
 
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 		case -1:
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 		default:
 			close(readPipe[1]);
 			close(writePipe[0]);
 			break;
 		}
@@ -135,23 +135,23 @@
 		sa.bInheritHandle = TRUE;
 		sa.lpSecurityDescriptor = NULL;
 
 		if (!CreatePipe(&readPipe[0], &readPipe[1], &sa, 0))
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 
 		if (!SetHandleInformation(readPipe[0], HANDLE_FLAG_INHERIT, 0))
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 
 		if (!CreatePipe(&writePipe[0], &writePipe[1], &sa, 0))
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 
 		if (!SetHandleInformation(writePipe[1], HANDLE_FLAG_INHERIT, 0))
 			@throw [OFInitializationFailedException
-			    exceptionWithClass: isa];
+			    exceptionWithClass: [self class]];
 
 		memset(&pi, 0, sizeof(pi));
 		memset(&si, 0, sizeof(si));
 
 		si.cb = sizeof(si);
@@ -201,11 +201,11 @@
 		@try {
 			if (!CreateProcess([program cStringWithEncoding:
 			    OF_STRING_ENCODING_NATIVE], argumentsCString, NULL,
 			    NULL, TRUE, 0, NULL, NULL, &si, &pi))
 				@throw [OFInitializationFailedException
-				    exceptionWithClass: isa];
+				    exceptionWithClass: [self class]];
 		} @finally {
 			free(argumentsString);
 		}
 
 		[pool release];
@@ -255,11 +255,11 @@
 			atEndOfStream = YES;
 			return 0;
 		}
 
 #endif
-		@throw [OFReadFailedException exceptionWithClass: isa
+		@throw [OFReadFailedException exceptionWithClass: [self class]
 							  stream: self
 						 requestedLength: length];
 	}
 
 	if (ret == 0)
@@ -279,11 +279,11 @@
 
 	if (writePipe[1] == NULL || atEndOfStream ||
 	    !WriteFile(writePipe[1], buffer, length, &ret, NULL) ||
 	    ret < length)
 #endif
-		@throw [OFWriteFailedException exceptionWithClass: isa
+		@throw [OFWriteFailedException exceptionWithClass: [self class]
 							   stream: self
 						  requestedLength: length];
 }
 
 - (void)dealloc