X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fworkers%2FConservationThread.java;h=571234cb749388a0fe8f2a875301e25aae5918b7;hb=21fb81914f40016a2860c71948a4a2759c9e153c;hp=b2a67b7a4e69c6fe2847e536614fb3c569dcf038;hpb=5ae21c312e4dcc80389bc4f5c534db9428db2217;p=jalview.git

diff --git a/src/jalview/workers/ConservationThread.java b/src/jalview/workers/ConservationThread.java
index b2a67b7..571234c 100644
--- a/src/jalview/workers/ConservationThread.java
+++ b/src/jalview/workers/ConservationThread.java
@@ -115,6 +115,12 @@ public class ConservationThread extends AlignCalcWorker
     }
     calcMan.workerComplete(this);
 
+    if ((alignViewport == null) || (calcMan == null)
+            || (alignViewport.isClosed()))
+    {
+      abortAndDestroy();
+      return;
+    }
     if (ap != null)
     {
       ap.paintAlignment(true);