Rearrange code so that the local variable is always initialized and
disposed.
Signed-off-by: NOlaf Hering <olaf@aepfle.de>
Cc: Jim Fehlig <jfehlig@suse.com>