[Ian] per review comment of shane removing null check