Fix another new null pointer :(