added locator null feature