diff --git a/MatterControlLib/ApplicationView/AppContext.cs b/MatterControlLib/ApplicationView/AppContext.cs
index b29ae6704..393b0ad15 100644
--- a/MatterControlLib/ApplicationView/AppContext.cs
+++ b/MatterControlLib/ApplicationView/AppContext.cs
@@ -164,7 +164,10 @@ namespace MatterHackers.MatterControl
 
 					var themeConfig = JsonConvert.DeserializeObject<ThemeConfig>(json);
 					themeConfig.EnsureDefaults();
-					ThemeConfigExtensions.RebuildTheme(ThemeSet.Theme);
+					if (ThemeSet?.Theme != null)
+					{
+						ThemeConfigExtensions.RebuildTheme(ThemeSet.Theme);
+					}
 
 					return themeConfig;
 				}
diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt
index f860fe8ba..adf735e2b 100644
--- a/StaticData/Translations/Master.txt
+++ b/StaticData/Translations/Master.txt
@@ -1819,6 +1819,9 @@ Translated:Filament Unloaded
 English:Filament Volume
 Translated:Filament Volume
 
+English:File
+Translated:File
+
 English:File May Cause Problems
 Translated:File May Cause Problems