JAL-3187 handle no mapping / complement features without NPE

[jalview.git] / src / jalview / gui / SeqPanel.java

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index c794e57..55b8559 100644 (file)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -790,12 +790,15 @@ public class SeqPanel extends JPanel
                 : seq.getDatasetSequence();
         MappedFeatures mf = fr2
                 .findComplementFeaturesAtResidue(ds, pos);
-        List<String> pv = mf.findProteinVariants();
-        for (String s : pv)
+        if (mf != null)
         {
-          if (!infos.contains(s))
+          List<String> pv = mf.findProteinVariants();
+          for (String s : pv)
           {
-            infos.addAll(pv);
+            if (!infos.contains(s))
+            {
+              infos.addAll(pv);
+            }
           }
         }
       }
@@ -933,7 +936,10 @@ public class SeqPanel extends JPanel
           FeatureRendererModel fr2 = af.getFeatureRenderer();
           MappedFeatures mf = fr2.findComplementFeaturesAtResidue(sequence,
                   pos);
-          seqARep.appendFeatures(tooltipText, pos, mf.features, fr2);
+          if (mf != null)
+          {
+            seqARep.appendFeatures(tooltipText, pos, mf.features, fr2);
+          }
         }
       }
     }