Add some insurance against accidental null pointers.