Fix some logic related to the try-finally test
Update the bugfix number
Fix some logic related to the try-else test