From 193a6cce3facdcbd11ee141e2c07387deefc5c19 Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Fri, 23 Mar 2018 19:18:28 +0300
Subject: [PATCH] Fix: only try merging query object if it exists.

---
 redash/tasks/queries.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/redash/tasks/queries.py b/redash/tasks/queries.py
index 4c89392b0..353caec24 100644
--- a/redash/tasks/queries.py
+++ b/redash/tasks/queries.py
@@ -462,8 +462,8 @@ class QueryExecutor(object):
         if error:
             self.tracker.update(state='failed')
             result = QueryExecutionError(error)
-            self.scheduled_query = models.db.session.merge(self.scheduled_query, load=False)
-            if self.scheduled_query:
+            if self.scheduled_query is not None:
+                self.scheduled_query = models.db.session.merge(self.scheduled_query, load=False)
                 self.scheduled_query.schedule_failures += 1
                 models.db.session.add(self.scheduled_query)
         else: