Now checks if name already exists. Fixes #25