From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 2 Feb 2015 20:35:48 +0000 (+0000)
Subject: Merge branch 'bug/JAL-1644_Finder-logic-improvement' into develop
X-Git-Tag: Jalview_2_9~99
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fc53972ee9b75c05e7a4d9f1f1552e822718efde;hp=b28bddf12e2791a019fba9c233d46407deb65976;p=jalview.git

Merge branch 'bug/JAL-1644_Finder-logic-improvement' into develop
---

diff --git a/src/jalview/analysis/Finder.java b/src/jalview/analysis/Finder.java
index fe3abe4..7b7204e 100644
--- a/src/jalview/analysis/Finder.java
+++ b/src/jalview/analysis/Finder.java
@@ -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;