one more null-check