Merge "Deal gracefully with fatal exceptions during full backup"