Fixed some try-catch