From c961c33e4951d96d679364ab8416591e8719e4bf Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Sun, 9 Feb 2020 13:17:43 +0200
Subject: [PATCH] If the error message happens to be empty, it will break
 serailization. (#4622)

---
 redash/serializers/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/redash/serializers/__init__.py b/redash/serializers/__init__.py
index b33d05275ff..c98cbc5b904 100644
--- a/redash/serializers/__init__.py
+++ b/redash/serializers/__init__.py
@@ -284,6 +284,7 @@ def serialize_job(job):
         updated_at = 0
 
     status = STATUSES[job_status]
+    query_result_id = None
 
     if isinstance(job.result, Exception):
         error = str(job.result)
@@ -292,6 +293,7 @@ def serialize_job(job):
         error = "Query execution cancelled."
     else:
         error = ""
+        query_result_id = job.result
 
     return {
         "job": {
@@ -299,6 +301,6 @@ def serialize_job(job):
             "updated_at": updated_at,
             "status": status,
             "error": error,
-            "query_result_id": job.result if job.is_finished and not error else None,
+            "query_result_id": query_result_id,
         }
     }