diff --git a/redash/query_runner/hive_ds.py b/redash/query_runner/hive_ds.py
index e167f6f5ef..f7027c1d5e 100644
--- a/redash/query_runner/hive_ds.py
+++ b/redash/query_runner/hive_ds.py
@@ -124,7 +124,8 @@ def run_query(self, query):
             logging.exception(e)
             raise sys.exc_info()[1], None, sys.exc_info()[2]
         finally:
-            connection.close()
+            if connection:
+                connection.close()
 
         return json_data, error