Added null support.