Started adding try/catch