Minor tweak removing null