Change a thing so no ull pointers