More null checks in wrapper.