@@ -206,11 +206,14 @@
 - (OFStream *)streamForReadingCurrentEntry
 {
 	if (_mode != OF_TAR_ARCHIVE_MODE_READ)
 		@throw [OFInvalidArgumentException exception];
 
-	return [[_lastReturnedStream retain] autorelease];
+	if (_lastReturnedStream == nil)
+		@throw [OFInvalidArgumentException exception];
+
+	return [[(OFStream *)_lastReturnedStream retain] autorelease];
 }
 
 - (OFStream *)streamForWritingEntry: (OFTarArchiveEntry *)entry
 {
 	void *pool;
@@ -231,11 +234,11 @@
 	    initWithStream: _stream
 		     entry: entry];
 
 	objc_autoreleasePoolPop(pool);
 
-	return [[_lastReturnedStream retain] autorelease];
+	return [[(OFStream *)_lastReturnedStream retain] autorelease];
 }
 
 - (void)close
 {
 	if (_stream == nil)