diff --git a/management/internals/modules/reverseproxy/proxy/manager/manager_test.go b/management/internals/modules/reverseproxy/proxy/manager/manager_test.go
index 8dfba500b..5baee4e68 100644
--- a/management/internals/modules/reverseproxy/proxy/manager/manager_test.go
+++ b/management/internals/modules/reverseproxy/proxy/manager/manager_test.go
@@ -3,6 +3,7 @@ package manager
 import (
 	"context"
 	"errors"
+	"fmt"
 	"testing"
 	"time"
 
@@ -69,7 +70,7 @@ func (m *mockStore) GetProxyByAccountID(ctx context.Context, accountID string) (
 	if m.getProxyByAccountIDFunc != nil {
 		return m.getProxyByAccountIDFunc(ctx, accountID)
 	}
-	return nil, nil
+	return nil, fmt.Errorf("proxy not found for account %s", accountID)
 }
 func (m *mockStore) CountProxiesByAccountID(ctx context.Context, accountID string) (int64, error) {
 	if m.countProxiesByAccountIDFunc != nil {
diff --git a/proxy/management_integration_test.go b/proxy/management_integration_test.go
index abf31cc66..2f65792f2 100644
--- a/proxy/management_integration_test.go
+++ b/proxy/management_integration_test.go
@@ -6,6 +6,7 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"errors"
+	"fmt"
 	"net"
 	"sync"
 	"sync/atomic"
@@ -229,8 +230,8 @@ func (m *testProxyManager) CleanupStale(_ context.Context, _ time.Duration) erro
 	return nil
 }
 
-func (m *testProxyManager) GetAccountProxy(_ context.Context, _ string) (*nbproxy.Proxy, error) {
-	return nil, nil
+func (m *testProxyManager) GetAccountProxy(_ context.Context, accountID string) (*nbproxy.Proxy, error) {
+	return nil, fmt.Errorf("proxy not found for account %s", accountID)
 }
 
 func (m *testProxyManager) CountAccountProxies(_ context.Context, _ string) (int64, error) {