diff --git a/src/net/java/sip/communicator/plugin/splashscreen/SplashScreenActivator.java b/src/net/java/sip/communicator/plugin/splashscreen/SplashScreenActivator.java
index fb7c38b01..7710bf3c8 100644
--- a/src/net/java/sip/communicator/plugin/splashscreen/SplashScreenActivator.java
+++ b/src/net/java/sip/communicator/plugin/splashscreen/SplashScreenActivator.java
@@ -52,6 +52,8 @@ public void serviceChanged(ServiceEvent evt)
 
     public void bundleChanged(BundleEvent evt)
     {
-        welcomeWindow.setBundle(evt.getBundle().getHeaders().get("Bundle-Name").toString());
+        if(welcomeWindow != null && welcomeWindow.isShowing())
+            welcomeWindow.setBundle(evt.getBundle().getHeaders()
+                .get("Bundle-Name").toString());
     }            
 }