@@ -106,11 +106,11 @@
 		queueFDs = [[OFDataArray alloc] initWithItemSize: sizeof(int)];
 
 #ifndef _WIN32
 		if (pipe(cancelFD))
 			@throw [OFInitializationFailedException
-			    newWithClass: isa];
+			    exceptionWithClass: isa];
 #else
 		/* Make sure WSAStartup has been called */
 		[OFTCPSocket class];
 
 		cancelFD[0] = socket(AF_INET, SOCK_DGRAM, 0);
@@ -117,11 +117,11 @@
 		cancelFD[1] = socket(AF_INET, SOCK_DGRAM, 0);
 
 		if (cancelFD[0] == INVALID_SOCKET ||
 		    cancelFD[1] == INVALID_SOCKET)
 			@throw [OFInitializationFailedException
-			    newWithClass: isa];
+			    exceptionWithClass: isa];
 
 		cancelAddr.sin_family = AF_INET;
 		cancelAddr.sin_port = 0;
 		cancelAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
 		cancelAddr2 = cancelAddr;
@@ -128,18 +128,18 @@
 
 		if (bind(cancelFD[0], (struct sockaddr*)&cancelAddr,
 		    sizeof(cancelAddr)) || bind(cancelFD[1],
 		    (struct sockaddr*)&cancelAddr2, sizeof(cancelAddr2)))
 			@throw [OFInitializationFailedException
-			    newWithClass: isa];
+			    exceptionWithClass: isa];
 
 		cancelAddrLen = sizeof(cancelAddr);
 
 		if (getsockname(cancelFD[0], (struct sockaddr*)&cancelAddr,
 		    &cancelAddrLen))
 			@throw [OFInitializationFailedException
-			    newWithClass: isa];
+			    exceptionWithClass: isa];
 #endif
 
 		maxFD = cancelFD[0];
 		FDToStream = [self allocMemoryForNItems: maxFD + 1
 						 ofSize: sizeof(OFStream*)];
@@ -272,30 +272,30 @@
 #endif
 }
 
 - (void)_addFileDescriptorForReading: (int)fd
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)_addFileDescriptorForWriting: (int)fd
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)_removeFileDescriptorForReading: (int)fd
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)_removeFileDescriptorForWriting: (int)fd
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)_processQueue
 {
 	[mutex lock];
@@ -370,12 +370,12 @@
 	[self observeWithTimeout: -1];
 }
 
 - (BOOL)observeWithTimeout: (int)timeout
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (BOOL)_processCache
 {
 	OFAutoreleasePool *pool;