From 04ba06ccadaab498c8af86e4672fcd8648b4a754 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Wed, 10 Oct 2018 09:38:42 +0200
Subject: [PATCH] cloudwatch: return early if execute query returns error

This will stop a segfault from happening

(cherry picked from commit 0612ce9b75c20ce385401a51b719d4561488dce9)
---
 pkg/tsdb/cloudwatch/cloudwatch.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 53ae2eae727..61bbc04394a 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -133,6 +133,7 @@ func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queryCo
 				result.Results[query.RefId] = &tsdb.QueryResult{
 					Error: err,
 				}
+				return nil
 			}
 			result.Results[queryRes.RefId] = queryRes
 			return nil