JAL-4121 Added a NPE check caught in tests. Added --gui to relevant tests.

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

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 159cf75..7535f60 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -451,11 +451,14 @@ public class Jalview
                 .getDefault("DEFAULT_CLOSE_EXTERNAL_VIEWERS", false)
                 || Cache.getDefault("ALWAYS_CLOSE_EXTERNAL_VIEWERS", false);
         StructureViewerBase.setQuitClose(closeExternal);
-        for (JInternalFrame frame : Desktop.desktop.getAllFrames())
+        if (desktop != null)
         {
-          if (frame instanceof StructureViewerBase)
+          for (JInternalFrame frame : Desktop.desktop.getAllFrames())
           {
-            ((StructureViewerBase) frame).closeViewer(closeExternal);
+            if (frame instanceof StructureViewerBase)
+            {
+              ((StructureViewerBase) frame).closeViewer(closeExternal);
+            }
           }
         }