diff --git a/src/archive.c b/src/archive.c
index 647bb5fd..4b9cd18a 100644
--- a/src/archive.c
+++ b/src/archive.c
@@ -65,10 +65,10 @@ do_archive_push(char *wal_file_path, char *wal_file_name)
 	join_path_components(absolute_wal_file_path, current_dir, wal_file_path);
 	join_path_components(backup_wal_file_path, arclog_path, wal_file_name);
 
+	elog(INFO, "pg_probackup archive-push from %s to %s", absolute_wal_file_path, backup_wal_file_path);
 	if (access(backup_wal_file_path, F_OK) != -1)
 		elog(ERROR, "file '%s', already exists.", backup_wal_file_path);
 
-	elog(INFO, "pg_probackup archive-push from %s to %s", absolute_wal_file_path, backup_wal_file_path);
 	copy_wal_file(absolute_wal_file_path, backup_wal_file_path);
 	elog(INFO, "pg_probackup archive-push completed successfully");
 
diff --git a/src/pg_probackup.c b/src/pg_probackup.c
index 867df105..5e688aee 100644
--- a/src/pg_probackup.c
+++ b/src/pg_probackup.c
@@ -405,7 +405,7 @@ main(int argc, char *argv[])
 				elog(ERROR, "show-config command doesn't accept any options except -B and --instance");
 			return do_configure(true);
 		case SET_CONFIG:
-			if (argc == 5)
+			if (argc == 6)
 				elog(ERROR, "set-config command requires at least one option");
 			return do_configure(false);
 	}