Added support for 'null' values.