diff --git a/server/djrandom/frontend/search.py b/server/djrandom/frontend/search.py
index 8d4575282cf5d87e4893aca2c5f8f3df232bb36b..3294b7949a2da33a58e7f625bb0153823b8868e3 100644
--- a/server/djrandom/frontend/search.py
+++ b/server/djrandom/frontend/search.py
@@ -1,6 +1,9 @@
+import logging
 import solr
 from collections import defaultdict
 
+log = logging.getLogger(__name__)
+
 
 class Searcher(object):
 
@@ -14,6 +17,7 @@ class Searcher(object):
         except solr.SolrException, e:
             log.error('SOLR exception (query="%s"): %s' % (
                 qstr, e))
+            return
         for doc in results.results:
             yield doc['score'], doc['id']
 
@@ -27,6 +31,7 @@ class Searcher(object):
         except solr.SolrException, e:
             log.error('SOLR exception (query="%s"): %s' % (
                 query_str, e))
+            return []
 
         # Parse and uniq-ify the results.
         hashes_set = set(hashes)