diff --git a/patroni/ha.py b/patroni/ha.py
index 9203e153..d4102e61 100644
--- a/patroni/ha.py
+++ b/patroni/ha.py
@@ -107,10 +107,10 @@ class Ha:
     def follow_the_leader(self, demote_reason, follow_reason, refresh=True):
         refresh and self.load_cluster_from_dcs()
         ret = demote_reason if self.state_handler.is_leader() else follow_reason
-        if not self.state_handler.check_recovery_conf(self.cluster.leader):
+        leader = self.cluster.leader
+        leader = None if (leader and leader.name) == self.state_handler.name else leader
+        if not self.state_handler.check_recovery_conf(leader):
             self._async_executor.schedule('changing primary_conninfo and restarting')
-            leader = self.cluster.leader
-            leader = None if (leader and leader.name) == self.state_handler.name else leader
             self._async_executor.run_async(self.state_handler.follow_the_leader, (leader, ))
         return ret
 
diff --git a/patroni/zookeeper.py b/patroni/zookeeper.py
index c328ae52..c6bfe639 100644
--- a/patroni/zookeeper.py
+++ b/patroni/zookeeper.py
@@ -197,7 +197,7 @@ class ZooKeeper(AbstractDCS):
         except NoNodeError:
             return value == '' or (not index and self._create(self.failover_path, value.encode('utf-8')))
         except:
-            logging.exception('foo')
+            logging.exception('set_failover_value')
             return False
 
     def initialize(self):