Remove inner try/catch