added Unfound node handling for EntityDescriptors