diff --git a/FRBDK/Glue/Glue/Plugins/ExportedImplementations/CommandInterfaces/FileCommands.cs b/FRBDK/Glue/Glue/Plugins/ExportedImplementations/CommandInterfaces/FileCommands.cs
index 20bea6ef3..8cffc9121 100644
--- a/FRBDK/Glue/Glue/Plugins/ExportedImplementations/CommandInterfaces/FileCommands.cs
+++ b/FRBDK/Glue/Glue/Plugins/ExportedImplementations/CommandInterfaces/FileCommands.cs
@@ -90,12 +90,12 @@ public IEnumerable<FilePath> GetAllFilesNeededOnDisk()
         ReferencedFileSave[] GetAllRfses()
         {
             var allRfses =
-                GlueProject.Entities.SelectMany(item => item.ReferencedFiles)
+                GlueProject?.Entities.SelectMany(item => item.ReferencedFiles)
                 .Concat(GlueProject.Screens.SelectMany(item2 => item2.ReferencedFiles))
                 .Concat(GlueProject.GlobalFiles)
                 .ToArray();
 
-            return allRfses;
+            return allRfses ?? new ReferencedFileSave[0];
         }
 
         public List<FilePath> GetAllReferencedFileNames()