X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=2fa3351020a2d9b010404a18af7962f95508b489;hb=66616c7a1c2e1d72e98573258b14cd23b5e45ea7;hp=5fc2a01989c3796edac9520bb936c173b3395d0d;hpb=1dabd11f09a42682d2b62d0a7bfccfd4114e07d9;p=jalview.git

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 5fc2a01..2fa3351 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -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;