Fix no name crash