Made NullResolver public