One last null checks to make the last of the GCC warnings go away

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>