Index: dll/cpl/intl/advanced.c
===================================================================
--- dll/cpl/intl/advanced.c	(revision 74931)
+++ dll/cpl/intl/advanced.c	(working copy)
@@ -61,19 +61,19 @@
             {
                 pCodePage->NextItem = PCPage;
                 PCPage = pCodePage;
+                wsprintf(szSection, L"CODEPAGE_REMOVE_%d", uiCodePage);
+                
+                if ((uiCodePage == GetACP()) ||
+                    (uiCodePage == GetOEMCP()) ||
+                    (!SetupFindFirstLineW(hInf, szSection, L"AddReg", &Context2)))
+                {
+                    pCodePage->Flags |= CODEPAGE_NOT_REMOVEABLE;
+                }
             }
             else
             {
                 HeapFree(GetProcessHeap(), 0, pCodePage);
             }
-
-            wsprintf(szSection, L"CODEPAGE_REMOVE_%d", uiCodePage);
-            if ((uiCodePage == GetACP()) ||
-                (uiCodePage == GetOEMCP()) ||
-                (!SetupFindFirstLineW(hInf, szSection, L"AddReg", &Context2)))
-            {
-                pCodePage->Flags |= CODEPAGE_NOT_REMOVEABLE;
-            }
         }
 
         if (!SetupFindNextLine(&Context, &Context))