diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 5211d64582c930bc9104772ca7af1d5d6e44dda1..18fe68b29ed2e438c87ca57feb27f250725174dc 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -267,7 +267,6 @@ func (c *Cluster) sameVolumeWith(volume spec.Volume) (match bool, reason string)
 	return
 }
 
-
 func (c *Cluster) compareStatefulSetWith(statefulSet *v1beta1.StatefulSet) (match, needsReplace, needsRollUpdate bool, reason string) {
 	match = true
 	//TODO: improve me
diff --git a/pkg/cluster/resources.go b/pkg/cluster/resources.go
index 31a07dde65d7b0f92a4bc5c6e87fa5aea3510354..7166c7f23122e78b1fc9506bb312c2f65b023491 100644
--- a/pkg/cluster/resources.go
+++ b/pkg/cluster/resources.go
@@ -7,11 +7,11 @@ import (
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/pkg/apis/apps/v1beta1"
 
-	"github.com/zalando-incubator/postgres-operator/pkg/util/retryutil"
 	"github.com/zalando-incubator/postgres-operator/pkg/spec"
 	"github.com/zalando-incubator/postgres-operator/pkg/util"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil"
+	"github.com/zalando-incubator/postgres-operator/pkg/util/retryutil"
 )
 
 func (c *Cluster) loadResources() error {
@@ -174,10 +174,11 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
 	err := retryutil.Retry(constants.StatefulsetDeletionInterval, constants.StatefulsetDeletionTimeout,
 		func() (bool, error) {
 			_, err := c.KubeClient.StatefulSets(oldStatefulset.Namespace).Get(oldStatefulset.Name)
+
 			return err != nil, nil
 		})
 	if err != nil {
-		fmt.Errorf("could not delete statefulset: %s", err)
+		return fmt.Errorf("could not delete statefulset: %s", err)
 	}
 
 	// create the new statefulset with the desired spec. It would take over the remaining pods.
@@ -191,9 +192,9 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
 			c.logger.Warnf("Number of pods for the old and updated Statefulsets is not identical")
 		}
 	}
+
 	c.Statefulset = createdStatefulset
 	return nil
-
 }
 
 func (c *Cluster) deleteStatefulSet() error {