From f74bc48d16c1c7df28ef47e640507804c9e80b55 Mon Sep 17 00:00:00 2001
From: Viktor Liu <17948409+lixmal@users.noreply.github.com>
Date: Thu, 29 Jan 2026 18:05:06 +0800
Subject: [PATCH] [Client] Stop NetBird on firewall init failure (#5208)

---
 client/internal/engine.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/internal/engine.go b/client/internal/engine.go
index f0693e82c..63ba1c9f2 100644
--- a/client/internal/engine.go
+++ b/client/internal/engine.go
@@ -573,9 +573,11 @@ func (e *Engine) createFirewall() error {
 
 	var err error
 	e.firewall, err = firewall.NewFirewall(e.wgInterface, e.stateManager, e.flowManager.GetLogger(), e.config.DisableServerRoutes, e.config.MTU)
-	if err != nil || e.firewall == nil {
-		log.Errorf("failed creating firewall manager: %s", err)
-		return nil
+	if err != nil {
+		return fmt.Errorf("create firewall manager: %w", err)
+	}
+	if e.firewall == nil {
+		return fmt.Errorf("create firewall manager: received nil manager")
 	}
 
 	if err := e.initFirewall(); err != nil {