diff --git a/ckanext/odsh/logic/action.py b/ckanext/odsh/logic/action.py
index d5fb843ad4cdece2d3a2d103d1757473a48201a8..5dd9e29e06bd6fe6655dafb11c1bc6ac6b77b124 100644
--- a/ckanext/odsh/logic/action.py
+++ b/ckanext/odsh/logic/action.py
@@ -138,7 +138,11 @@ def autocomplete(context, data_dict):
         raise SearchError('SOLR returned an error running query: %r Error: %r' %
                           (query, e))
 
-    suggest = solr_response.raw_response.get("terms").get("suggest")
+    suggest = solr_response.raw_response.get("terms", {}).get("suggest")
+
+    if not suggest:
+        return []
+    
     suggestions = sorted(suggest, key=suggest.get, reverse=True)
     filtered_suggestions = []
     for suggestion in suggestions: