I would make sure you take your divorce papers (decree absolute) with you. I took mine with me just in case, although I had been led to believe that the only thing that was required was the Certificate Of No Impediment and then the local version acquired from the British Embassy, but when we went to apply for the marriage licence I was asked to produce my divorce papers.
Iain.