early failures would prevent cleanup

because we are using finally: to do cleanup, we are cleaning
up variables which may never have been allocated, thus throwing
and additional exception and leaving state around after our
shutdown.

Discovered by bug #1087298 however this is not a fix for that
bug

Change-Id: I395301e619cc290367aa0ab8fb02d729343f1432
1 file changed