From 8797be9f896c73bf94ad9ca51043568f1fad17f8 Mon Sep 17 00:00:00 2001
From: stuart nelson <stuartnelson3@gmail.com>
Date: Thu, 9 Jun 2016 15:16:53 +0200
Subject: [PATCH] Add existence check for canceler.

---
 public/app/core/services/backend_srv.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/app/core/services/backend_srv.js b/public/app/core/services/backend_srv.js
index 5ba40dfc86b..3c96e3c69b4 100644
--- a/public/app/core/services/backend_srv.js
+++ b/public/app/core/services/backend_srv.js
@@ -131,7 +131,9 @@ function (angular, _, coreModule, config) {
         if (requestIsLocal && firstAttempt && err.status === 401) {
           return self.loginPing().then(function() {
             options.retry = 1;
-            canceler.resolve();
+            if (canceler) {
+              canceler.resolve();
+            }
             return self.datasourceRequest(options);
           });
         }