From 06c49ad7309d4a770538e22644742631b07c4300 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 23 May 2016 15:47:26 +0200
Subject: [PATCH] Add null check

---
 gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index 51bbd270ba..578f532305 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -231,7 +231,8 @@ public class MainViewModel implements ViewModel {
                 startupTimeout.stop();
                 walletInitialized.removeListener(walletInitializedListener);
                 onAllServicesInitialized();
-                startupTimeoutPopup.hide();
+                if (startupTimeoutPopup != null)
+                    startupTimeoutPopup.hide();
             }
         });
     }