more null-checking