BUGFIX: better resiliency in the backup/restore processes