exception checks for (de)uniquify

[jalview.git] / src / jalview / analysis / SeqsetUtils.java

diff --git a/src/jalview/analysis/SeqsetUtils.java b/src/jalview/analysis/SeqsetUtils.java
index 4432414..40869c2 100755 (executable)
--- a/src/jalview/analysis/SeqsetUtils.java
+++ b/src/jalview/analysis/SeqsetUtils.java
@@ -66,6 +66,8 @@ public class SeqsetUtils
   public static boolean SeqCharacterUnhash(SequenceI sq, Hashtable sqinfo)\r
   {\r
     boolean namePresent = true;\r
+    if (sqinfo==null)\r
+      return false;\r
     String oldname = (String) sqinfo.get("Name");\r
     Integer start = (Integer) sqinfo.get("Start");\r
     Integer end = (Integer) sqinfo.get("End");\r
@@ -81,8 +83,7 @@ public class SeqsetUtils
     {\r
       sq.setName(oldname);\r
     }\r
-\r
-    if (!pdbid.equals(""))\r
+    if (pdbid!=null && pdbid.size()>0)\r
     {\r
       sq.setPDBId(pdbid);\r
     }\r