index: properly repair name storage (do not produce NPE-s)