3 files changed, 19 insertions, 13 deletions
diff --git a/python/fatcat_web/templates/container_search.html b/python/fatcat_web/templates/container_search.html
index ce868991..bd92dc2b 100644
--- a/python/fatcat_web/templates/container_search.html
+++ b/python/fatcat_web/templates/container_search.html
@@ -80,6 +80,8 @@
 
   {% endif %}
 
+{% elif es_error %}
+  {{ search_macros.es_error_msg(es_error) }}
 {% endif %}
 
 </div>
diff --git a/python/fatcat_web/templates/release_search.html b/python/fatcat_web/templates/release_search.html
index e004efc1..7fb475e3 100644
--- a/python/fatcat_web/templates/release_search.html
+++ b/python/fatcat_web/templates/release_search.html
@@ -74,6 +74,8 @@
 
   {% endif %}
 
+{% elif es_error %}
+  {{ search_macros.es_error_msg(es_error) }}
 {% endif %}
 
 </div>
diff --git a/python/fatcat_web/templates/search_macros.html b/python/fatcat_web/templates/search_macros.html
index 383c271c..a207bfbc 100644
--- a/python/fatcat_web/templates/search_macros.html
+++ b/python/fatcat_web/templates/search_macros.html
@@ -44,23 +44,25 @@ found.count_returned }} out of {{ found.count_found }} results</i>&nbsp;&nbsp;
 {% macro es_error_msg(es_error) %}
   <div class="ui icon error message">
     <i class="ban icon"></i>
-    {% if es_error.status_code == 400 %}
-      <div class="content">
-        <div class="header">
+    <div class="content">
+      <div class="header">
+        {% if es_error.status_code == 400 %}
           Query Error
-        </div>
+        {% else %}
+          Search Index Error
+          {% if es_error.status_code %}({{ es_error.status_code }}){% endif %}
+        {% endif %}
+      </div>
+      {% if es_error.description %}
         <p>Computer said: <code>{{ es_error.description }}</code>
+      {% elif es_error.name %}
+        <p><b>{{ es_error.name }}</b>
+      {% endif %}
+      {% if es_error.status_code == 400 %}
         <p>Query parsing is currently very naive. Sometimes you can fix this
         problem by adding quotes around terms or entire phrases.
-      </div>
-    {% else %}
-      <div class="content">
-        <div class="header">
-          Search Index Error ({{ es_error.status_code }})
-        </div>
-        <p>Computer said: <code>{{ es_error.description }}</code>
-      </div>
-    {% endif %}
+      {% endif %}
+    </div>
   </div>
 {% endmacro %}