From 5be2332c668ab459d7f0eadd16ece31b02fa193d Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Mon, 5 Nov 2018 09:58:13 +0100
Subject: [PATCH] handle error before populating cache

---
 pkg/services/sqlstore/user.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 5619cd2859b..6e4b12ca7c3 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -353,8 +353,12 @@ func (ss *SqlStore) GetSignedInUserWithCache(query *m.GetSignedInUserQuery) erro
 	}
 
 	err := GetSignedInUser(query)
+	if err != nil {
+		return err
+	}
+
 	ss.CacheService.Set(cacheKey, query.Result, time.Second*5)
-	return err
+	return nil
 }
 
 func GetSignedInUser(query *m.GetSignedInUserQuery) error {