From c0844527e938d3d692603e2586d873e6efeeb87d Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 19 Feb 2015 14:57:01 +0000
Subject: [PATCH] JAL-653 JAL-966 TODO and avoid NPE when desktop instance
 unavailable

---
 src/jalview/io/FileLoader.java |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 6329f58..aa76da5 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -384,7 +384,9 @@ public class FileLoader implements Runnable
 
           final String errorMessage = "Couldn't load file " + title + "\n"
                   + error;
-          if (raiseGUI)
+          // TODO: refactor FileLoader to be independent of Desktop / Applet GUI
+          // bits ?
+          if (raiseGUI && Desktop.desktop != null)
           {
             javax.swing.SwingUtilities.invokeLater(new Runnable()
             {
-- 
1.7.10.2