some try-catch added