@@ -55,12 +55,12 @@
 - init
 {
 	if (isa == [OFStream class]) {
 		Class c = isa;
 		[self release];
-		@throw [OFNotImplementedException newWithClass: c
-						      selector: _cmd];
+		@throw [OFNotImplementedException exceptionWithClass: c
+							    selector: _cmd];
 	}
 
 	self = [super init];
 
 	cache = NULL;
@@ -70,26 +70,26 @@
 	return self;
 }
 
 - (BOOL)_isAtEndOfStream
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (size_t)_readNBytes: (size_t)length
 	   intoBuffer: (void*)buffer
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)_writeNBytes: (size_t)length
 	  fromBuffer: (const void*)buffer
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - copy
 {
 	return [self retain];
@@ -691,12 +691,12 @@
 	delimiterUTF8String = [delimiter UTF8String];
 	delimiterLength = [delimiter UTF8StringLength];
 	j = 0;
 
 	if (delimiterLength == 0)
-		@throw [OFInvalidArgumentException newWithClass: isa
-						       selector: _cmd];
+		@throw [OFInvalidArgumentException exceptionWithClass: isa
+							     selector: _cmd];
 
 	/* Look if there's something in our cache */
 	if (!waitingForDelimiter && cache != NULL) {
 		for (i = 0; i < cacheLength; i++) {
 			if (cache[i] != delimiterUTF8String[j++])
@@ -1330,16 +1330,16 @@
 {
 	char *UTF8String;
 	int length;
 
 	if (format == nil)
-		@throw [OFInvalidArgumentException newWithClass: isa
-						       selector: _cmd];
+		@throw [OFInvalidArgumentException exceptionWithClass: isa
+							     selector: _cmd];
 
 	if ((length = of_vasprintf(&UTF8String, [format UTF8String],
 	    arguments)) == -1)
-		@throw [OFInvalidFormatException newWithClass: isa];
+		@throw [OFInvalidFormatException exceptionWithClass: isa];
 
 	@try {
 		[self writeNBytes: length
 		       fromBuffer: UTF8String];
 	} @finally {
@@ -1365,39 +1365,39 @@
 	int flags;
 
 	blocking = enable;
 
 	if ((flags = fcntl([self fileDescriptor], F_GETFL)) == -1)
-		@throw [OFSetOptionFailedException newWithClass: isa
-							 stream: self];
+		@throw [OFSetOptionFailedException exceptionWithClass: isa
+							       stream: self];
 
 	if (enable)
 		flags &= ~O_NONBLOCK;
 	else
 		flags |= O_NONBLOCK;
 
 	if (fcntl([self fileDescriptor], F_SETFL, flags) == -1)
-		@throw [OFSetOptionFailedException newWithClass: isa
-							 stream: self];
+		@throw [OFSetOptionFailedException exceptionWithClass: isa
+							       stream: self];
 #else
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 #endif
 }
 
 - (int)fileDescriptor
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)close
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (BOOL)_isWaitingForDelimiter
 {
 	return waitingForDelimiter;
 }
 @end