AI-512 : NPE fix in LocationPersister