Avoid another possible null pointer dereference