X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FFinder.java;h=2484facc5c1c4f80832fef1577a239160351066a;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=224c60a227be4abc50b95f0421e3502e728651a5;hpb=50bc9bfda9c71e968f53e6a77ba3ea9cdfd6d3ee;p=jalview.git

diff --git a/src/jalview/analysis/Finder.java b/src/jalview/analysis/Finder.java
index 224c60a..2484fac 100644
--- a/src/jalview/analysis/Finder.java
+++ b/src/jalview/analysis/Finder.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -152,7 +152,8 @@ public class Finder
           }
         }
 
-        if (isIncludeDescription() && regex.search(seq.getDescription()))
+        if (isIncludeDescription() && seq.getDescription() != null
+                && regex.search(seq.getDescription()))
         {
           idMatch.addElement(seq);
           hasResults = true;
@@ -205,7 +206,7 @@ public class Finder
           {
             continue;
           }
-
+          // if invalid string used, then regex has no matched to/from
           int sres = seq
                   .findPosition(resIndex
                           + Integer.parseInt(spaces.elementAt(resIndex)