diff --git a/superset/assets/javascripts/explorev2/components/DisplayQueryButton.jsx b/superset/assets/javascripts/explorev2/components/DisplayQueryButton.jsx
index a8aea850f71e..1912016b4ae7 100644
--- a/superset/assets/javascripts/explorev2/components/DisplayQueryButton.jsx
+++ b/superset/assets/javascripts/explorev2/components/DisplayQueryButton.jsx
@@ -57,7 +57,7 @@ export default class DisplayQueryButton extends React.PureComponent {
     });
   }
   beforeOpen() {
-    if (this.props.chartStatus === 'loading' || this.props.chartStatus === null) {
+    if (['loading', null].indexOf(this.props.chartStatus) >= 0 || !this.props.queryResponse) {
       this.fetchQuery();
     } else {
       this.setStateFromQueryResponse();
@@ -72,11 +72,13 @@ export default class DisplayQueryButton extends React.PureComponent {
       />);
     } else if (this.state.error) {
       return <pre>{this.state.error}</pre>;
+    } else if (this.state.query) {
+      return (
+        <SyntaxHighlighter language={this.state.language} style={github}>
+          {this.state.query}
+        </SyntaxHighlighter>);
     }
-    return (
-      <SyntaxHighlighter language={this.state.language} style={github}>
-        {this.state.query}
-      </SyntaxHighlighter>);
+    return null;
   }
   render() {
     return (
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index d1dc7a6bd104..1ed45023fbc9 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -547,7 +547,8 @@ def query(self, query_obj):
         except Exception as e:
             status = QueryStatus.FAILED
             logging.exception(e)
-            error_message = str(e)
+            error_message = (
+                self.database.db_engine_spec.extract_error_message(e))
 
         return QueryResult(
             status=status,
diff --git a/superset/db_engine_specs.py b/superset/db_engine_specs.py
index 2d6d28d7e9ca..4d91cd2cd934 100644
--- a/superset/db_engine_specs.py
+++ b/superset/db_engine_specs.py
@@ -484,11 +484,12 @@ def handle_cursor(cls, cursor, query, session):
 
     @classmethod
     def extract_error_message(cls, e):
-        if hasattr(e, 'orig') \
-           and type(e.orig).__name__ == 'DatabaseError' \
-           and isinstance(e.orig[0], dict):
+        if (
+                hasattr(e, 'orig') and
+                type(e.orig).__name__ == 'DatabaseError' and
+                isinstance(e.orig[0], dict)):
             error_dict = e.orig[0]
-            e = '{} at {}: {}'.format(
+            return '{} at {}: {}'.format(
                 error_dict['errorName'],
                 error_dict['errorLocation'],
                 error_dict['message']