use try finally as usual

Change-Id: I49a78e164e6e31bec4d6872d1217c2286c0eb845