Merge "Add missing try/finallys"