diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchService.java b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchService.java
index d80de917e..1e42e3526 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchService.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchService.java
@@ -66,7 +66,7 @@ public void finished() {
 
     private void processQuery(String query) {
     	UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
-        if (searchServices == null) {
+        if (searchServices == null || searchServices.isEmpty()) {
             JOptionPane.showMessageDialog(SparkManager.getMainWindow(), Res.getString("message.search.service.not.available"), Res.getString("title.error"), JOptionPane.ERROR_MESSAGE);
             return;
         }
diff --git a/core/src/main/resources/i18n/spark_i18n.properties b/core/src/main/resources/i18n/spark_i18n.properties
index 12991da0a..6b35d136b 100644
--- a/core/src/main/resources/i18n/spark_i18n.properties
+++ b/core/src/main/resources/i18n/spark_i18n.properties
@@ -648,7 +648,7 @@ message.save.profile = To save changes to your profile, click save
 message.search.for.contacts = Search for contacts
 message.search.input.short = Please provide at least two letters.
 message.search.for.other.people = Search for other people on the server
-message.search.service.not.available = Unable to contact search service
+message.search.service.not.available = Contact search service is not available
 message.searching.please.wait = Searching, please wait...
 message.select.add.room.to.add = Please select a room to add to your service list
 message.select.one.or.more = Select one or more users in your roster