Fixed null check style in conditions