removed "of is null" if it is possible
  (this cset should be SCRUM related, but not approved as scrum task yet)