Added editableEntry not null check (win)