Merge branch 'develop' into development/Release_2_12_Branch_JAL-4102_21126_merge

diff --git a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
index 28c41e9..cbc6add 100644 (file)
--- a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
+++ b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java
@@ -453,7 +453,10 @@ public class ThreeDBStructureChooserQuerySource
           pdbEntry.setRetrievalUrl(urlStr);
         }
         pdbEntry.setProvider(typeColumn);
-        pdbEntry.setProviderPage(modelPage);
+        if (modelPage != null)
+        {
+          pdbEntry.setProviderPage(modelPage);
+        }
         selectedSeq.getDatasetSequence().addPDBId(pdbEntry);
       }
       pdbEntriesToView[count++] = pdbEntry;