check for null residues

diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index 6a1e58b..2cf5beb 100755 (executable)
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -253,7 +253,10 @@ public class AnnotationPanel extends Panel implements AdjustmentListener
 \r
       for(j=startRes; j<endRes; j++)\r
       {\r
-        validRes = row.annotations[j]==null?false:true;\r
+        if(row.annotations.length<=j || row.annotations[j]==null)\r
+        validRes = false;\r
+       else\r
+         validRes = true;\r
 \r
        x = (j-startRes)*av.charWidth;\r
 \r

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 77f557b..b8d35dc 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -432,7 +432,10 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
 \r
       for(j=startRes; j<endRes; j++)\r
       {\r
-        validRes = row.annotations[j]==null?false:true;\r
+        if(row.annotations.length<=j || row.annotations[j]==null)\r
+        validRes = false;\r
+       else\r
+         validRes = true;\r
 \r
        x = (j-startRes)*av.charWidth;\r
 \r