Adjust try/catch