Added try/catch