diff --git a/LightlessSync/FileCache/FileCacheManager.cs b/LightlessSync/FileCache/FileCacheManager.cs
index 34e5a5b..51487f6 100644
--- a/LightlessSync/FileCache/FileCacheManager.cs
+++ b/LightlessSync/FileCache/FileCacheManager.cs
@@ -189,7 +189,14 @@ public sealed class FileCacheManager : IHostedService
 
             Parallel.ForEach(allEntities, entity =>
             {
-                cacheDict[entity.PrefixedFilePath] = entity;
+                if (entity != null && entity.PrefixedFilePath != null)
+                {
+                    cacheDict[entity.PrefixedFilePath] = entity;
+                }
+                else
+                {
+                    _logger.LogWarning("Null FileCacheEntity or PrefixedFilePath encountered in cache population: {entity}", entity);
+                }
             });
 
             var cleanedPaths = new ConcurrentDictionary<string, string>(StringComparer.OrdinalIgnoreCase);