a little more null-safety