add null checking condition