From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 21 Oct 2014 16:36:13 +0000 (+0100)
Subject: JAL-674 check for null vector before ...
X-Git-Tag: Jalview_2_9~165^2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=060fb4cd10b89e532cfcc26039aafec6d83c052d;p=jalview.git

JAL-674 check for null vector before ...
---

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index a99f172..132aea8 100755
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -331,11 +331,17 @@ public class PDBfile extends jalview.io.AlignFile
         {
           if (sq.getDatasetSequence() != null)
           {
-            sq.getDatasetSequence().getPDBId().clear();
+            if (sq.getDatasetSequence().getPDBId() != null)
+            {
+              sq.getDatasetSequence().getPDBId().clear();
+            }
           }
           else
           {
-            sq.getPDBId().clear();
+            if (sq.getPDBId() != null)
+            {
+              sq.getPDBId().clear();
+            }
           }
         }
         AlignSeq.replaceMatchingSeqsWith(seqs, annotations, prot, al, AlignSeq.PEP, false);
@@ -370,11 +376,17 @@ public class PDBfile extends jalview.io.AlignFile
         {
           if (sq.getDatasetSequence() != null)
           {
-            sq.getDatasetSequence().getPDBId().clear();
+            if (sq.getDatasetSequence().getPDBId() != null)
+            {
+              sq.getDatasetSequence().getPDBId().clear();
+            }
           }
           else
           {
-            sq.getPDBId().clear();
+            if (sq.getPDBId() != null)
+            {
+              sq.getDatasetSequence().getPDBId().clear();
+            }
           }
         }
         AlignSeq.replaceMatchingSeqsWith(seqs, annotations, rna, al, AlignSeq.DNA, false);