@@ -40,10 +40,11 @@
 #import "OFOpenItemFailedException.h"
 #import "OFOutOfRangeException.h"
 #import "OFSeekFailedException.h"
 #import "OFTruncatedDataException.h"
 #import "OFUnsupportedVersionException.h"
+#import "OFWriteFailedException.h"
 
 /*
  * FIXME: Current limitations:
  *  - Split archives are not supported.
  *  - Encrypted files cannot be read.
@@ -874,26 +875,36 @@
 	[super dealloc];
 }
 
 - (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
-	size_t bytesWritten;
-
 #if SIZE_MAX >= INT64_MAX
 	if (length > INT64_MAX)
 		@throw [OFOutOfRangeException exception];
 #endif
 
 	if (INT64_MAX - _bytesWritten < (int64_t)length)
 		@throw [OFOutOfRangeException exception];
 
-	bytesWritten = [_stream writeBuffer: buffer length: length];
+	@try {
+		[_stream writeBuffer: buffer length: length];
+	} @catch (OFWriteFailedException *e) {
+		OFEnsure(e.bytesWritten < length);
+
+		_bytesWritten += (int64_t)e.bytesWritten;
+		_CRC32 = OFCRC32(_CRC32, buffer, e.bytesWritten);
+
+		if (e.errNo == EWOULDBLOCK)
+			return e.bytesWritten;
+
+		@throw e;
+	}
 
-	_bytesWritten += (int64_t)bytesWritten;
+	_bytesWritten += (int64_t)length;
 	_CRC32 = OFCRC32(_CRC32, buffer, length);
 
-	return bytesWritten;
+	return length;
 }
 
 - (void)close
 {
 	if (_stream == nil)