More protection against null pointers