JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / schemes / RNAHelicesColour.java

diff --git a/src/jalview/schemes/RNAHelicesColour.java b/src/jalview/schemes/RNAHelicesColour.java
index ffc013d..9729a83 100644 (file)
--- a/src/jalview/schemes/RNAHelicesColour.java
+++ b/src/jalview/schemes/RNAHelicesColour.java
@@ -40,7 +40,6 @@ import java.util.Map;
 public class RNAHelicesColour extends ResidueColourScheme
 {
 
-
   /**
    * Maps sequence positions to the RNA helix they belong to. Key: position,
    * Value: helix TODO: Revise or drop in favour of annotation position numbers
@@ -92,6 +91,10 @@ public class RNAHelicesColour extends ResidueColourScheme
     // This loop will find the first rna structure annotation by which to colour
     // the sequences.
     AlignmentAnnotation[] annotations = alignment.getAlignmentAnnotation();
+    if (annotations == null)
+    {
+      return;
+    }
     for (int i = 0; i < annotations.length; i++)
     {