more try/catch added