Re-added AddonRepository null lock check