From fffc975467c9b91cdf526ba8e06fdeab840ffc7f Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Mon, 10 Jan 2011 17:00:30 +0000
Subject: [PATCH] patch for JAL-740

---
 src/jalview/gui/Finder.java |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 1c767a1..2fa3351 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -246,11 +246,14 @@ public class Finder extends GFinder
     {
       String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs"
               : "";
-      if (idMatch.size() > 0 && searchResults.getSize() > 0)
+      if (searchResults != null)
       {
-        message += " and ";
+        if (idMatch.size() > 0 && searchResults.getSize() > 0)
+        {
+          message += " and ";
+        }
+        message += searchResults.getSize() + " subsequence matches found.";
       }
-      message += searchResults.getSize() + " subsequence matches found.";
       JOptionPane.showInternalMessageDialog(this, message, null,
               JOptionPane.INFORMATION_MESSAGE);
       resIndex = -1;
-- 
1.7.10.2