diff --git a/src/dotnet/APIView/APIViewWeb/Managers/CodeFileManager.cs b/src/dotnet/APIView/APIViewWeb/Managers/CodeFileManager.cs
index baf58449476..f9d40c3ecae 100644
--- a/src/dotnet/APIView/APIViewWeb/Managers/CodeFileManager.cs
+++ b/src/dotnet/APIView/APIViewWeb/Managers/CodeFileManager.cs
@@ -79,19 +79,22 @@ public async Task<CodeFile> GetCodeFileAsync(string repoName,
                     foreach (var entry in archive.Entries)
                     {
                         var fileName = Path.GetFileName(entry.Name);
-                        if (fileName == originalFileName)
+                        if (!string.IsNullOrEmpty(fileName))
                         {
-                            await entry.Open().CopyToAsync(originalFileStream);
-                        }
-
-                        if (fileName == codeFileName)
-                        {
-                            var language = LanguageServiceHelpers.GetLanguageFromRepoName(repoName);
-                            codeFile = await CodeFile.DeserializeAsync(entry.Open(), doTreeStyleParserDeserialization: LanguageServiceHelpers.UseTreeStyleParser(language));
-                        }
-                        else if (fileName == baselineCodeFileName)
-                        {
-                            await entry.Open().CopyToAsync(baselineStream);
+                            if (fileName == originalFileName)
+                            {
+                                await entry.Open().CopyToAsync(originalFileStream);
+                            }
+
+                            if (fileName == codeFileName)
+                            {
+                                var language = LanguageServiceHelpers.GetLanguageFromRepoName(repoName);
+                                codeFile = await CodeFile.DeserializeAsync(entry.Open(), doTreeStyleParserDeserialization: LanguageServiceHelpers.UseTreeStyleParser(language));
+                            }
+                            else if (fileName == baselineCodeFileName)
+                            {
+                                await entry.Open().CopyToAsync(baselineStream);
+                            }
                         }
                     }
                 }