More try/catch updates.