I think ask at your local immigration office is best. I do think though it's possibly an administration error on there part at the Embassy and they have tried to correct it. In any case a quick trip to your local immigration office will clarify things for you.
If you haven't got a "Multi Entry" stamp in your Passport you will need to go to Immigration a few days before your trip and ask for an Exit stamp so your Extension doesn't become void.