check for null viewport on dataset recovery

diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java
index 15c3d59..06f1b25 100755 (executable)
--- a/src/jalview/gui/PCAPanel.java
+++ b/src/jalview/gui/PCAPanel.java
@@ -283,7 +283,7 @@ public class PCAPanel
       // AlignmentOrder origorder = new AlignmentOrder(alAndColsel[0]);
 
       Alignment al = new Alignment( (SequenceI[]) alAndColsel[0]);
-      Alignment dataset = av.getAlignment().getDataset();
+      Alignment dataset = (av!=null && av.getAlignment()!=null) ? av.getAlignment().getDataset() : null;
       if (dataset != null)
       {
         al.setDataset(dataset);

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 762ad58..f85ad9c 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -416,6 +416,7 @@ public class TreePanel
       // but this may fail if the view was closed...
       gc = av.
       getGapCharacter();
+      
     } catch (Exception ex) {};
     Object[] alAndColsel = tree.seqData.getAlignmentAndColumnSelection(gc);
 
@@ -424,7 +425,7 @@ public class TreePanel
       // AlignmentOrder origorder = new AlignmentOrder(alAndColsel[0]);
 
       Alignment al = new Alignment( (SequenceI[]) alAndColsel[0]);
-      Alignment dataset = av.getAlignment().getDataset();
+      Alignment dataset = (av!=null && av.getAlignment()!=null) ? av.getAlignment().getDataset() : null;
       if (dataset != null)
       {
         al.setDataset(dataset);