From fe6f2e0e7318a513509e309a5f07d27156df1993 Mon Sep 17 00:00:00 2001
From: Christopher Poile <cpoile@gmail.com>
Date: Thu, 31 Aug 2023 10:56:39 -0400
Subject: [PATCH] MM-54313 - Fix: panic in handleGetAllChannels (#511)

* fix MM-54313

* wrap appErr
---
 server/api.go   | 2 +-
 server/store.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/api.go b/server/api.go
index 2e73c6e3d..2da5f9626 100644
--- a/server/api.go
+++ b/server/api.go
@@ -139,7 +139,7 @@ func (p *Plugin) handleGetAllChannels(w http.ResponseWriter, r *http.Request) {
 			state, err := p.kvGetChannelState(channelID, false)
 			if err != nil {
 				p.LogError(err.Error())
-				http.Error(w, appErr.Error(), http.StatusInternalServerError)
+				continue
 			}
 
 			enabled := state.Enabled
diff --git a/server/store.go b/server/store.go
index e4955246c..d226f05db 100644
--- a/server/store.go
+++ b/server/store.go
@@ -53,7 +53,7 @@ func (p *Plugin) KVGet(key string, fromWriter bool) ([]byte, error) {
 	if !fromWriter {
 		data, appErr := p.API.KVGet(key)
 		if appErr != nil {
-			return nil, appErr
+			return nil, fmt.Errorf("failed to kvget for key: %s error: %w", key, appErr)
 		}
 		return data, nil
 	}