More try/catch fixes