diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 206d37d5482..2c24f9734dc 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -63,9 +63,9 @@ import javax.swing.JLabel;
 import javax.swing.JLayeredPane;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JToolBar.Separator;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
+import javax.swing.JToolBar.Separator;
 
 import mage.cards.Card;
 import mage.cards.ExpansionSet;
@@ -519,7 +519,9 @@ public class MageFrame extends javax.swing.JFrame {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 new MageFrame().setVisible(true);
-                splash.close();
+                if (splash != null) {
+                	splash.close();
+                }
             }
         });
     }