diff --git a/controllers/nginx/controller.go b/controllers/nginx/controller.go
index 0124f06fe..107f9f36f 100644
--- a/controllers/nginx/controller.go
+++ b/controllers/nginx/controller.go
@@ -291,42 +291,52 @@ func (lbc *loadBalancerController) updateEpNamedPorts(key string) {
 				return
 			}
 
-			lbc.checkSvcForUpdate(svc)
+			err = lbc.checkSvcForUpdate(svc)
+			if err != nil {
+				lbc.svcEpQueue.requeue(key, err)
+				return
+			}
 		}
 	}
 }
 
-func (lbc *loadBalancerController) checkSvcForUpdate(svc *api.Service) {
+// checkSvcForUpdate verifies if one of the running pods for a service contains
+// named port. If the annotation in the service does not exists or is not equals
+// to the port mapping obtained from the pod the service must be updated to reflect
+// the current state
+func (lbc *loadBalancerController) checkSvcForUpdate(svc *api.Service) error {
+	// get the pods associated with the service
 	pods, err := lbc.client.Pods(svc.Namespace).List(api.ListOptions{
 		LabelSelector: labels.Set(svc.Spec.Selector).AsSelector(),
 	})
 	if err != nil {
-		glog.Errorf("error searching service pods %v/%v: %v", svc.Namespace, svc.Name, err)
-		return
+		return fmt.Errorf("error searching service pods %v/%v: %v", svc.Namespace, svc.Name, err)
+	}
+
+	if len(pods.Items) == 0 {
+		return nil
 	}
 
 	namedPorts := map[string]string{}
+	// we need to check only one pod searching for named ports
+	pod := &pods.Items[0]
+	glog.V(4).Infof("checking pod %v/%v for named port information", pod.Namespace, pod.Name)
+	for i := range svc.Spec.Ports {
+		servicePort := &svc.Spec.Ports[i]
 
-	for i := range pods.Items {
-		pod := &pods.Items[i]
-		glog.V(4).Infof("checking pod %v/%v for named port information", pod.Namespace, pod.Name)
-		for i := range svc.Spec.Ports {
-			servicePort := &svc.Spec.Ports[i]
-
-			_, err := strconv.Atoi(servicePort.TargetPort.StrVal)
+		_, err := strconv.Atoi(servicePort.TargetPort.StrVal)
+		if err != nil {
+			portNum, err := podutil.FindPort(pod, servicePort)
 			if err != nil {
-				portNum, err := podutil.FindPort(pod, servicePort)
-				if err != nil {
-					glog.V(4).Infof("failed to find port for service %s/%s: %v", svc.Namespace, svc.Name, err)
-					continue
-				}
-
-				if servicePort.TargetPort.StrVal == "" {
-					continue
-				}
-
-				namedPorts[servicePort.TargetPort.StrVal] = fmt.Sprintf("%v", portNum)
+				glog.V(4).Infof("failed to find port for service %s/%s: %v", svc.Namespace, svc.Name, err)
+				continue
 			}
+
+			if servicePort.TargetPort.StrVal == "" {
+				continue
+			}
+
+			namedPorts[servicePort.TargetPort.StrVal] = fmt.Sprintf("%v", portNum)
 		}
 	}
 
@@ -337,13 +347,25 @@ func (lbc *loadBalancerController) checkSvcForUpdate(svc *api.Service) {
 	curNamedPort := svc.ObjectMeta.Annotations[namedPortAnnotation]
 	if !reflect.DeepEqual(curNamedPort, namedPorts) {
 		data, _ := json.Marshal(namedPorts)
-		svc.ObjectMeta.Annotations[namedPortAnnotation] = string(data)
-		glog.Infof("updating service %v with new named port mappings", svc.Name)
-		_, err := lbc.client.Services(svc.Namespace).Update(svc)
+
+		newSvc, err := lbc.client.Services(svc.Namespace).Get(svc.Name)
 		if err != nil {
-			glog.Errorf("error syncing service %v/%v: %v", svc.Namespace, svc.Name, err)
+			return fmt.Errorf("error getting service %v/%v: %v", svc.Namespace, svc.Name, err)
+		}
+
+		if svc.ObjectMeta.Annotations == nil {
+			svc.ObjectMeta.Annotations = map[string]string{}
+		}
+
+		newSvc.ObjectMeta.Annotations[namedPortAnnotation] = string(data)
+		glog.Infof("updating service %v with new named port mappings", svc.Name)
+		_, err = lbc.client.Services(svc.Namespace).Update(svc)
+		if err != nil {
+			return fmt.Errorf("error syncing service %v/%v: %v", svc.Namespace, svc.Name, err)
 		}
 	}
+
+	return nil
 }
 
 func (lbc *loadBalancerController) sync(key string) {
diff --git a/controllers/nginx/nginx.tmpl b/controllers/nginx/nginx.tmpl
index 046ffc7cd..02499dd74 100644
--- a/controllers/nginx/nginx.tmpl
+++ b/controllers/nginx/nginx.tmpl
@@ -180,7 +180,7 @@ http {
 
             proxy_set_header X-Forwarded-For        $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Host       $host;
-            proxy_set_header X­-Forwarded­-Port       $server_port;
+            proxy_set_header X-Forwarded­-Port       $server_port;
             proxy_set_header X-Forwarded-Proto      $pass_access_scheme;
 
             proxy_connect_timeout                   {{ $cfg.proxyConnectTimeout }}s;