diff --git a/network.go b/network.go
index cf6db9ba..61350bd5 100644
--- a/network.go
+++ b/network.go
@@ -157,7 +157,7 @@ func rpcSetNetworkSettings(settings RpcNetworkSettings) (*RpcNetworkSettings, er
 
 	l.Debug().Msg("setting new config")
 
-	rebootRequired := false
+	var rebootRequired bool
 	if netConfig.DHCPClient.String != config.NetworkConfig.DHCPClient.String {
 		rebootRequired = true
 	}
@@ -182,7 +182,9 @@ func rpcSetNetworkSettings(settings RpcNetworkSettings) (*RpcNetworkSettings, er
 	}
 
 	if rebootRequired {
-		rpcReboot(false)
+		if err := rpcReboot(false); err != nil {
+			return nil, err
+		}
 	}
 
 	return toRpcNetworkSettings(newConfig), nil
diff --git a/pkg/nmlite/link/manager.go b/pkg/nmlite/link/manager.go
index 4cf79046..2f1bc8b6 100644
--- a/pkg/nmlite/link/manager.go
+++ b/pkg/nmlite/link/manager.go
@@ -210,7 +210,9 @@ func (nm *NetlinkManager) EnsureInterfaceUpWithTimeout(ctx context.Context, ifac
 			return nil, ErrInterfaceUpCanceled
 		case <-linkUpTimeout:
 			attempt++
-			l.Error().Msg("interface is still down after timeout")
+			l.Error().
+				Int("attempt", attempt).
+				Msg("interface is still down after timeout")
 			if err != nil {
 				return nil, err
 			}