Check for null colour

[jalview.git] / src / jalview / appletgui / TreeCanvas.java

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index a6bc5df..451d663 100755 (executable)
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -490,8 +490,9 @@ System.out.println("called here");
                                                false, 0, av.alignment.getWidth());\r
 \r
 \r
-          if (av.getGlobalColourScheme().conservationApplied())\r
-          {\r
+          if (  av.getGlobalColourScheme()!=null\r
+             && av.getGlobalColourScheme().conservationApplied())\r
+            {\r
             Conservation c = new Conservation("Group",\r
                                               ResidueProperties.propHash, 3,\r
                                               sg.sequences, sg.getStartRes(),\r