AI-433 : LocationPersister - StackOverflowError fix