Be more null tolerant