X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=0fc4aa86af4e812147062be4bef39a366332c8ca;hb=37a5dfc3c72a42689e90ad8a0e118e8855d9868b;hp=9b06fdd9af28f158a0542ca9f31defbf86986422;hpb=f01e51c0c24a706409590174696ae72c4d573b7f;p=jalview.git

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 9b06fdd..0fc4aa8 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -125,7 +125,8 @@ public class FileLoader
 
     public void run()
     {
-      Desktop.instance.startLoading(file);
+      if (Desktop.instance != null)
+        Desktop.instance.startLoading(file);
 
       SequenceI[] sequences = null;
 
@@ -175,10 +176,12 @@ public class FileLoader
             {
             }
           }
-
         }
         else
         {
+          if (Desktop.instance != null)
+            Desktop.instance.stopLoading();
+
           JOptionPane.showInternalMessageDialog(Desktop.desktop,
                                                 "Couldn't load file " + file +
                                                 "\n"
@@ -193,7 +196,9 @@ public class FileLoader
         updateRecentlyOpened();
       }
 
-      Desktop.instance.stopLoading();
+      if (Desktop.instance != null)
+        Desktop.instance.stopLoading();
+
     }
   }