one more null check