Bug fix: the name can not be empty either