Added try/catches