Fixed #141: only check if name exists.