Merge branch 'jims_annotate3d_update' into menard_finalsep2012

[jalview.git] / src / jalview / renderer / AnnotationRenderer.java

diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java
index cb53eb6..64ab859 100644 (file)
--- a/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@ -319,6 +319,10 @@ public class AnnotationRenderer
     fm = g.getFontMetrics();
     AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
     int temp = 0;
+    if (aa==null)
+    {
+      return false;
+    }
     int x = 0, y = 0;
     int column = 0;
     char lastSS;