From f3db250fd7586b17784dd6d76a20d9a322bba094 Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Wed, 23 Nov 2016 13:05:28 +0200
Subject: [PATCH] [Cassandra] Fix: remove reference to non existing Error class

---
 redash/query_runner/cass.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/redash/query_runner/cass.py b/redash/query_runner/cass.py
index b8610ea13c..f00bff92a5 100644
--- a/redash/query_runner/cass.py
+++ b/redash/query_runner/cass.py
@@ -7,7 +7,7 @@
 logger = logging.getLogger(__name__)
 
 try:
-    from cassandra.cluster import Cluster, Error
+    from cassandra.cluster import Cluster
     from cassandra.auth import PlainTextAuthProvider
     enabled = True
 except ImportError:
@@ -85,10 +85,9 @@ def run_query(self, query, user):
             json_data = json.dumps(data, cls=JSONEncoder)
 
             error = None
-        except Error as e:
-            error = e.args[1]
         except KeyboardInterrupt:
             error = "Query cancelled by user."
+            json_data = None
 
         return json_data, error