diff --git a/libnetwork/endpoint.go b/libnetwork/endpoint.go
index 15df45a2f5..a2d1dbc4c6 100644
--- a/libnetwork/endpoint.go
+++ b/libnetwork/endpoint.go
@@ -992,7 +992,7 @@ func CreateOptionDisableResolution() EndpointOption {
 	}
 }
 
-//CreateOptionAlias function returns an option setter for setting endpoint alias
+// CreateOptionAlias function returns an option setter for setting endpoint alias
 func CreateOptionAlias(name string, alias string) EndpointOption {
 	return func(ep *endpoint) {
 		if ep.aliases == nil {
@@ -1013,14 +1013,14 @@ func CreateOptionService(name, id string, vip net.IP, ingressPorts []*PortConfig
 	}
 }
 
-//CreateOptionMyAlias function returns an option setter for setting endpoint's self alias
+// CreateOptionMyAlias function returns an option setter for setting endpoint's self alias
 func CreateOptionMyAlias(alias string) EndpointOption {
 	return func(ep *endpoint) {
 		ep.myAliases = append(ep.myAliases, alias)
 	}
 }
 
-//CreateOptionLoadBalancer function returns an option setter for denoting the endpoint is a load balancer for a network
+// CreateOptionLoadBalancer function returns an option setter for denoting the endpoint is a load balancer for a network
 func CreateOptionLoadBalancer() EndpointOption {
 	return func(ep *endpoint) {
 		ep.loadBalancer = true
diff --git a/libnetwork/sandbox.go b/libnetwork/sandbox.go
index c8f5a8abcb..315195ebb8 100644
--- a/libnetwork/sandbox.go
+++ b/libnetwork/sandbox.go
@@ -918,7 +918,7 @@ func (sb *sandbox) clearNetworkResources(origEp *endpoint) error {
 	}
 
 	if index == -1 {
-		logrus.Errorf("Endpoint %s has already been deleted", ep.Name())
+		logrus.Warnf("Endpoint %s has already been deleted", ep.Name())
 		sb.Unlock()
 		return nil
 	}
diff --git a/libnetwork/service_windows.go b/libnetwork/service_windows.go
index 31d958fe95..9ed3e06047 100644
--- a/libnetwork/service_windows.go
+++ b/libnetwork/service_windows.go
@@ -73,6 +73,7 @@ func (n *network) addLBBackend(ip, vip net.IP, lb *loadBalancer, ingressPorts []
 		if err != nil {
 			logrus.Errorf("Failed to add ILB policy for service %s (%s) with endpoints %v using load balancer IP %s on network %s: %v",
 				lb.service.name, vip.String(), endpoints, sourceVIP, n.Name(), err)
+			return
 		}
 
 		lbPolicylistMap[lb] = &policyLists{