Added conversion from NULL to null