diff --git a/repmgr.c b/repmgr.c
index 34f5649f..9b841551 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -488,7 +488,7 @@ main(int argc, char **argv)
 	 * If `use_replication_slots` set in the configuration file
 	 * and command line parameter `--wal-keep-segments` was used,
 	 * emit a warning as to the latter's redundancy. Note that
-	 * the version check for 9.4 or later will occur afterwards.
+	 * the version check for 9.4 or later is done in check_upstream_config()
 	 */
 
 	if(options.use_replication_slots && wal_keep_segments_used)
@@ -506,6 +506,7 @@ main(int argc, char **argv)
 	 * NOTE: the slot name will be defined for each record, including
 	 * the master; the `slot_name` column in `repl_nodes` defines
 	 * the name of the slot, but does not imply a slot has been created.
+	 * The version check for 9.4 or later  is done in check_upstream_config()
 	 */
 	if(options.use_replication_slots)
 	{
diff --git a/repmgrd.c b/repmgrd.c
index fcbf839c..c7a7616d 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -1503,8 +1503,8 @@ do_upstream_standby_failover(t_node_info upstream_node)
 			PQclear(res);
 			break;
 		}
-		PQclear(res);
 
+		PQclear(res);
 	}
 
 	/* Close the connection to this server */