From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 29 Sep 2016 10:53:51 +0000 (+0100)
Subject: Merge branch 'patch/JAL-2238_tcoffee_subgroups' into develop
X-Git-Tag: Release_2_10_0~30^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fecb7871ff2ec644c4f3c9ea513df7c0fce30514;hp=ab889432b2f2ebea75aca36e814efc42ab50b9ac;p=jalview.git

Merge branch 'patch/JAL-2238_tcoffee_subgroups' into develop
---

diff --git a/src/jalview/schemes/TCoffeeColourScheme.java b/src/jalview/schemes/TCoffeeColourScheme.java
index 62f3a2e..2be51c2 100644
--- a/src/jalview/schemes/TCoffeeColourScheme.java
+++ b/src/jalview/schemes/TCoffeeColourScheme.java
@@ -86,6 +86,10 @@ public class TCoffeeColourScheme extends ResidueColourScheme
     seqMap = new IdentityHashMap<SequenceI, Color[]>();
     AnnotatedCollectionI alcontext = alignment instanceof AlignmentI ? alignment
             : alignment.getContext();
+    if (alcontext == null)
+    {
+      return;
+    }
     int w = 0;
     for (AlignmentAnnotation al : alcontext
             .findAnnotation(TCoffeeScoreFile.TCOFFEE_SCORE))