FIX CommandEdit : NPE if add to CommandSet and no CommandSet exist