X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=e9e9358fe7a91bed5da42dd62a010668e75b6acf;hb=6495cefecdc75353b5fb9e8af9e45cc7069b4cc2;hp=e92379246f1a9a9e47745da24c515d14a23720ea;hpb=95a46891288f4fc63d690cab4f56879678f54fb6;p=jalview.git

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index e923792..e9e9358 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -102,7 +102,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
             av.setSelectionGroup(selected);
         }
 
-        selected.setEndRes(av.alignment.getWidth());
+        selected.setEndRes(av.alignment.getWidth()-1);
         selected.addOrRemove(sequence, true);
 
         PaintRefresher.Refresh(this, av.alignment);
@@ -718,7 +718,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
                         sg.cs.setThreshold(25, av.getIgnoreGapsConsensus());
                     }
 
-                    if (av.getGlobalColourScheme().conservationApplied())
+                    if (  av.getGlobalColourScheme()!=null
+                       && av.getGlobalColourScheme().conservationApplied())
                     {
                         Conservation c = new Conservation("Group",
                                 ResidueProperties.propHash, 3, sg.sequences,