@@ -390,13 +390,12 @@
 			_atEndOfStream = true;
 			return 0;
 		}
 
 #endif
-		@throw [OFReadFailedException exceptionWithClass: [self class]
-							  stream: self
-						 requestedLength: length];
+		@throw [OFReadFailedException exceptionWithStream: self
+						  requestedLength: length];
 	}
 
 	if (ret == 0)
 		_atEndOfStream = true;
 
@@ -414,13 +413,12 @@
 
 	if (_writePipe[1] == NULL || _atEndOfStream ||
 	    !WriteFile(_writePipe[1], buffer, length, &ret, NULL) ||
 	    ret < length)
 #endif
-		@throw [OFWriteFailedException exceptionWithClass: [self class]
-							   stream: self
-						  requestedLength: length];
+		@throw [OFWriteFailedException exceptionWithStream: self
+						   requestedLength: length];
 }
 
 - (int)fileDescriptorForReading
 {
 #ifndef _WIN32