@@ -97,13 +97,12 @@
 {
 	ssize_t ret;
 
 	if (_fd == -1 || _atEndOfStream ||
 	    (ret = read(_fd, buffer, length)) < 0)
-		@throw [OFReadFailedException exceptionWithClass: [self class]
-							  stream: self
-						 requestedLength: length];
+		@throw [OFReadFailedException exceptionWithStream: self
+						  requestedLength: length];
 
 	if (ret == 0)
 		_atEndOfStream = true;
 
 	return ret;
@@ -111,13 +110,12 @@
 
 - (void)lowlevelWriteBuffer: (const void*)buffer
 		     length: (size_t)length
 {
 	if (_fd == -1 || _atEndOfStream || write(_fd, buffer, length) < length)
-		@throw [OFWriteFailedException exceptionWithClass: [self class]
-							   stream: self
-						  requestedLength: length];
+		@throw [OFWriteFailedException exceptionWithStream: self
+						   requestedLength: length];
 }
 
 - (int)fileDescriptorForReading
 {
 	return _fd;