Let's not catch the final variable. Instead let's find it so that we can release it if needed

Signed-off-by: Jack Huey kitskub@gmail.com