From 2a5ba2e74a8954a82393c593f2987fac4d40d5f0 Mon Sep 17 00:00:00 2001
From: Tom Ratcliffe <tom.ratcliffe@grafana.com>
Date: Tue, 2 Sep 2025 14:25:28 +0100
Subject: [PATCH] Folders: Fix folder parents error handling (#109605)

---
 pkg/registry/apis/folders/sub_parents.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/registry/apis/folders/sub_parents.go b/pkg/registry/apis/folders/sub_parents.go
index 272e83870b7..53abaa59e87 100644
--- a/pkg/registry/apis/folders/sub_parents.go
+++ b/pkg/registry/apis/folders/sub_parents.go
@@ -58,14 +58,17 @@ func (r *subParentsREST) Connect(ctx context.Context, name string, opts runtime.
 		obj, err := r.getter.Get(ctx, name, &metav1.GetOptions{})
 		if storage.IsNotFound(err) {
 			responder.Object(http.StatusNotFound, nil)
+			return
 		}
 		if err != nil {
 			responder.Error(err)
+			return
 		}
 
 		folderObj, ok := obj.(*folders.Folder)
 		if !ok {
 			responder.Error(fmt.Errorf("expecting folder, found: %T", folderObj))
+			return
 		}
 
 		info := r.parents(ctx, folderObj)