diff --git a/Sources/TAR/TarContainer.swift b/Sources/TAR/TarContainer.swift
index dc4755de..ec06cdc0 100644
--- a/Sources/TAR/TarContainer.swift
+++ b/Sources/TAR/TarContainer.swift
@@ -26,11 +26,15 @@ public class TarContainer: Container {
         let infos = try info(container: data)
         var entries = [TarEntry]()
 
-        for infoEntry in infos {
-            let dataStartIndex = infoEntry.blockStartIndex + 512
-            let dataEndIndex = dataStartIndex + infoEntry.size!
-            let entryData = data[dataStartIndex..<dataEndIndex]
-            entries.append(TarEntry(infoEntry, entryData))
+        for entryInfo in infos {
+            if entryInfo.type == .directory {
+                entries.append(TarEntry(entryInfo, nil))
+            } else {
+                let dataStartIndex = entryInfo.blockStartIndex + 512
+                let dataEndIndex = dataStartIndex + entryInfo.size!
+                let entryData = data[dataStartIndex..<dataEndIndex]
+                entries.append(TarEntry(entryInfo, entryData))
+            }
         }
 
         return entries
diff --git a/Sources/ZIP/ZipContainer.swift b/Sources/ZIP/ZipContainer.swift
index f0a24267..3a54389c 100644
--- a/Sources/ZIP/ZipContainer.swift
+++ b/Sources/ZIP/ZipContainer.swift
@@ -28,9 +28,13 @@ public class ZipContainer: Container {
         let infos = try info(container: data)
         var entries = [ZipEntry]()
 
-        for infoEntry in infos {
-            let entryData = try ZipContainer.getEntryData(from: data, using: infoEntry)
-            entries.append(ZipEntry(infoEntry, entryData))
+        for entryInfo in infos {
+            if entryInfo.type == .directory {
+                entries.append(ZipEntry(entryInfo, nil))
+            } else {
+                let entryData = try ZipContainer.getEntryData(from: data, using: entryInfo)
+                entries.append(ZipEntry(entryInfo, entryData))
+            }
         }
 
         return entries