comment separator was in wrong place
Enforce 'name/desc cannot be None' as reported by @sbesson
also check for empty name text