diff --git a/src/validate.c b/src/validate.c
index 89a03233..3ef7cb6d 100644
--- a/src/validate.c
+++ b/src/validate.c
@@ -58,13 +58,19 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 	int			i;
 //	parray		*dbOid_exclude_list = NULL;
 
-	/* Check backup version */
+	/* Check backup program version */
 	if (parse_program_version(backup->program_version) > parse_program_version(PROGRAM_VERSION))
 		elog(ERROR, "pg_probackup binary version is %s, but backup %s version is %s. "
 			"pg_probackup do not guarantee to be forward compatible. "
 			"Please upgrade pg_probackup binary.",
 				PROGRAM_VERSION, base36enc(backup->start_time), backup->program_version);
 
+	/* Check backup server version */
+	if (strcmp(backup->server_version, PG_MAJORVERSION) != 0)
+        elog(ERROR, "Backup %s has server version %s, but current pg_probackup binary "
+					"compiled with server version %s",
+                base36enc(backup->start_time), backup->server_version, PG_MAJORVERSION);
+
 	if (backup->status == BACKUP_STATUS_RUNNING)
 	{
 		elog(WARNING, "Backup %s has status %s, change it to ERROR and skip validation",
@@ -120,13 +126,6 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 		return;
 	}
 
-    if (strcmp(backup->server_version, PG_MAJORVERSION) != 0)
-    {
-        elog(ERROR, "Backup was made with server version %s, but pg_probackup compiled "
-               "with server version %s.",
-                backup->server_version, PG_MAJORVERSION);
-    }
-
 //	if (params && params->partial_db_list)
 //		dbOid_exclude_list = get_dbOid_exclude_list(backup, files, params->partial_db_list,
 //														params->partial_restore_type);