diff --git a/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java b/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java
index 98230afbb7..9ac08d5538 100644
--- a/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java
+++ b/common/cpw/mods/fml/relauncher/FMLEmbeddingRelauncher.java
@@ -78,8 +78,11 @@ public class FMLEmbeddingRelauncher
         }
         finally
         {
-            popupWindow.setVisible(false);
-            popupWindow.dispose();
+            if (popupWindow!=null)
+            {
+                popupWindow.setVisible(false);
+                popupWindow.dispose();
+            }
         }
 
         try
@@ -182,6 +185,14 @@ public class FMLEmbeddingRelauncher
         {
             throw new RuntimeException(e);
         }
+        finally
+        {
+            if (popupWindow!=null)
+            {
+                popupWindow.setVisible(false);
+                popupWindow.dispose();
+            }
+        }
     }
 
     public static void appletStart(Applet applet)