Try/Catch added to ToDo