diff --git a/redash/query_runner/hive_ds.py b/redash/query_runner/hive_ds.py
index 361bdf2105..6b10e23ebc 100644
--- a/redash/query_runner/hive_ds.py
+++ b/redash/query_runner/hive_ds.py
@@ -9,6 +9,7 @@
 
 try:
     from pyhive import hive
+    from pyhive.exc import DatabaseError
     from thrift.transport import THttpClient
     enabled = True
 except ImportError:
@@ -129,6 +130,12 @@ def run_query(self, query, user):
                 connection.cancel()
             error = "Query cancelled by user."
             json_data = None
+        except DatabaseError as e:
+            try:
+                error = e.args[0].status.errorMessage
+            except AttributeError:
+                error = str(e)
+            json_data = None
         finally:
             if connection:
                 connection.close()