Add check for null of embedded indexes