diff --git a/Aaru.Filesystems/FAT/File.cs b/Aaru.Filesystems/FAT/File.cs
index e5a7245a0..1f047d006 100644
--- a/Aaru.Filesystems/FAT/File.cs
+++ b/Aaru.Filesystems/FAT/File.cs
@@ -264,7 +264,7 @@ namespace Aaru.Filesystems
                       nextCluster <= FAT16_RESERVED)
                 {
                     if(nextCluster > _fatEntries.Length)
-                        return null;
+                        break;
 
                     clusters.Add(nextCluster);
                     nextCluster = _fatEntries[nextCluster];
@@ -274,7 +274,7 @@ namespace Aaru.Filesystems
                       nextCluster <= FAT12_RESERVED)
                 {
                     if(nextCluster > _fatEntries.Length)
-                        return null;
+                        break;
 
                     clusters.Add(nextCluster);
                     nextCluster = _fatEntries[nextCluster];