Prevent a spurious read from uninitialized memory.
Cleanup and integration by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de>