Added support for null.