Check startup file is not null

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 23c7547..88e6236 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -81,7 +81,8 @@ public class Jalview extends JApplet
     try {\r
       initLogger();\r
     } catch (Exception e) {\r
-      System.out.println("Problems initializing the log4j system\n"+e);\r
+      System.err.println("Problems initializing the log4j system\n");\r
+      e.printStackTrace();\r
     }\r
     try{\r
        UIManager.setLookAndFeel(\r
@@ -120,7 +121,8 @@ public class Jalview extends JApplet
          frame.LoadFile(file, protocol, format);\r
      }\r
 \r
-     if(jalview.gui.Preferences.showStartupFile)\r
+     if(jalview.gui.Preferences.showStartupFile &&\r
+         jalview.gui.Preferences.startupFile!=null)\r
      {\r
        String file = jalview.gui.Preferences.startupFile;\r
        String protocol = "File";\r