Support --null switch