diff --git a/source/org/jivesoftware/smackx/FormField.java b/source/org/jivesoftware/smackx/FormField.java
index 124b0c62f..c8fafb965 100644
--- a/source/org/jivesoftware/smackx/FormField.java
+++ b/source/org/jivesoftware/smackx/FormField.java
@@ -332,6 +332,10 @@ public class FormField {
             return value;
         }
 
+        public String toString(){
+            return getLabel();
+        }
+
         public String toXML() {
             StringBuffer buf = new StringBuffer();
             buf.append("<option");
diff --git a/source/org/jivesoftware/smackx/search/UserSearchManager.java b/source/org/jivesoftware/smackx/search/UserSearchManager.java
index 50c8ff67d..945eadd84 100644
--- a/source/org/jivesoftware/smackx/search/UserSearchManager.java
+++ b/source/org/jivesoftware/smackx/search/UserSearchManager.java
@@ -93,12 +93,17 @@ public class UserSearchManager {
         DiscoverItems items = discoManager.discoverItems(con.getServiceName());
         for (Iterator it = items.getItems(); it.hasNext();) {
             DiscoverItems.Item item = (DiscoverItems.Item) it.next();
-            DiscoverInfo info = discoManager.discoverInfo(item.getEntityID());
-            if (info.containsFeature("jabber:iq:search")) {
-                searchServices.add(item.getEntityID());
+            try {
+                DiscoverInfo info = discoManager.discoverInfo(item.getEntityID());
+                if (info.containsFeature("jabber:iq:search")) {
+                    searchServices.add(item.getEntityID());
+                }
+            }
+            catch (XMPPException e) {
+                // No info found.
+                break;
             }
         }
         return searchServices;
     }
-
 }