change try/catches