Review try / finally blocks to ensure clarity

[hazendaz]

See #1214 , try/finally block is being used to perform action that is not directly part of the try block need. This is a bit confusing and causal coding in that area can cause code to be broken easily by moving out of the try block code that doesn't need to be in a try block to start with. The indirect close in this case is a side effect of the finally block but not really that clear. All code should be reviewed to see how often this is done and see if this can be written in a better way so that any code movement doesn't indirectly break code relying on finally in that way.