Merge "Add missing "try ... finally" safeguards"