add more null support