diff --git a/frontend/src/App.js b/frontend/src/App.js
index 69132d9..d5b73e4 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -201,11 +201,7 @@ AND refs.ref_name = 'HEAD'`
 
     const newResults = new Map(this.state.results);
 
-    if (status === STATUS_SUCCESS) {
-      newResults.set(key, result);
-    } else {
-      newResults.delete(key);
-    }
+    newResults.set(key, result);
 
     this.setState({
       results: newResults,
diff --git a/frontend/src/components/TabbedResults.js b/frontend/src/components/TabbedResults.js
index 0732c28..3388acb 100644
--- a/frontend/src/components/TabbedResults.js
+++ b/frontend/src/components/TabbedResults.js
@@ -2,7 +2,6 @@ import React, { Component, Fragment } from 'react';
 import {
   Row,
   Col,
-  Alert,
   Tab,
   Button,
   OverlayTrigger,
@@ -19,6 +18,7 @@ import CloseIcon from '../icons/close-query-tab.svg';
 import TimerIcon from '../icons/history-tab.svg';
 import LoadingImg from '../icons/alex-loading-results.gif';
 import SuspendedImg from '../icons/alex-suspended-tab.gif';
+import ErrorImg from '../icons/broken-alex.gif';
 
 class TabTitle extends Component {
   constructor(props) {
@@ -209,11 +209,22 @@ class TabbedResults extends Component {
                 );
               } else if (query.errorMsg) {
                 content = (
-                  <Row className="errors-row">
-                    <Col xs={12}>
-                      <Alert bsStyle="danger">{query.errorMsg}</Alert>
-                    </Col>
-                  </Row>
+                  <Fragment>
+                    <span className="result-error-msg">{query.errorMsg}</span>
+                    <Row>
+                      <Col className="text-center animation-col" xs={12}>
+                        <img src={`${ErrorImg}?${key}`} alt="error animation" />
+                      </Col>
+                    </Row>
+                    <Row>
+                      <Col
+                        className="text-center message-col last-message-col"
+                        xs={12}
+                      >
+                        QUERY FAILED
+                      </Col>
+                    </Row>
+                  </Fragment>
                 );
               } else if (query.response) {
                 content = (
diff --git a/frontend/src/components/TabbedResults.less b/frontend/src/components/TabbedResults.less
index cb90bc3..82cdbfb 100644
--- a/frontend/src/components/TabbedResults.less
+++ b/frontend/src/components/TabbedResults.less
@@ -30,8 +30,16 @@
             }
         }
 
+        span.result-error-msg {
+            font-size: 14px;
+            color: @error-text;
+        }
+
         .animation-col {
             margin-top: 3em;
+            img {
+                max-height: 240px;
+            }
         }
 
         .message-col {
@@ -56,6 +64,7 @@
 
         .query-text {
             flex: 0 1 auto;
+            height: 100%;
             white-space: pre;
             font-family: @monospace-font;
             color: @secondary-tint-2;
diff --git a/frontend/src/icons/broken-alex.gif b/frontend/src/icons/broken-alex.gif
new file mode 100644
index 0000000..94e60e7
Binary files /dev/null and b/frontend/src/icons/broken-alex.gif differ