Add some try-catch