Add one more null check