Fix issue where will_sync_role lock may not yet exist