Added not null check condition