more null safety work