Fixed: if name is none it fails