diff --git a/InfernalRobotics/InfernalRobotics/Gui/WindowManager.cs b/InfernalRobotics/InfernalRobotics/Gui/WindowManager.cs
index 04080355..3699111f 100644
--- a/InfernalRobotics/InfernalRobotics/Gui/WindowManager.cs
+++ b/InfernalRobotics/InfernalRobotics/Gui/WindowManager.cs
@@ -1621,11 +1621,12 @@ public void ShowIRWindow()
 
             if(HighLogic.LoadedSceneIsEditor || guiFlightEditorWindowOpen)
             {
-                _editorWindowFader.FadeTo(_UIAlphaValue, 0.1f, () => { GUIEnabled = true; appLauncherButton.SetTrue(false); });
+                if(_editorWindowFader != null)
+                    _editorWindowFader.FadeTo(_UIAlphaValue, 0.1f, () => { GUIEnabled = true; appLauncherButton.SetTrue(false); });
             }
-            else
+            else if(_controlWindowFader != null)
             {
-                _controlWindowFader.FadeTo(_UIAlphaValue, 0.1f, () => { GUIEnabled = true; appLauncherButton.SetTrue(false); });
+                    _controlWindowFader.FadeTo(_UIAlphaValue, 0.1f, () => { GUIEnabled = true; appLauncherButton.SetTrue(false); });
             }
 
         }