@@ -176,11 +176,15 @@
 
 	if (_mode != OF_TAR_ARCHIVE_MODE_READ)
 		@throw [OFInvalidArgumentException exception];
 
 	[(OFTarArchiveFileReadStream *)_lastReturnedStream of_skip];
-	[_lastReturnedStream close];
+	@try {
+		[_lastReturnedStream close];
+	} @catch (OFNotOpenException *e) {
+		/* Might have already been closed by the user - that's fine. */
+	}
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
 	if (_stream.atEndOfStream)
 		return nil;
@@ -235,11 +239,15 @@
 	    _mode != OF_TAR_ARCHIVE_MODE_APPEND)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
-	[_lastReturnedStream close];
+	@try {
+		[_lastReturnedStream close];
+	} @catch (OFNotOpenException *e) {
+		/* Might have already been closed by the user - that's fine. */
+	}
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
 	[entry of_writeToStream: _stream
 		       encoding: _encoding];
@@ -257,11 +265,15 @@
 - (void)close
 {
 	if (_stream == nil)
 		return;
 
-	[_lastReturnedStream close];
+	@try {
+		[_lastReturnedStream close];
+	} @catch (OFNotOpenException *e) {
+		/* Might have already been closed by the user - that's fine. */
+	}
 	[_lastReturnedStream release];
 	_lastReturnedStream = nil;
 
 	if (_mode == OF_TAR_ARCHIVE_MODE_WRITE ||
 	    _mode == OF_TAR_ARCHIVE_MODE_APPEND) {