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

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index 5fc2a01..c758166 100755
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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;