removed some try-catch-finally issues