Added primary_locator validation