Updated null support.