diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 9173d1b..866c3e3 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -139,8 +139,7 @@
     ptr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ImmHkl));
 
     ptr->hkl = hkl;
-    ImmGetIMEFileNameW(hkl, filename, MAX_PATH);
-    ptr->hIME = LoadLibraryW(filename);
+    if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename);
     if (ptr->hIME)
     {
         LOAD_FUNCPTR(ImeInquire);
@@ -179,7 +178,7 @@
 {
     ImmHkl *ptr,*cursor2;
 
-    LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &ImmHklList, ImmHkl, entry);
+    LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &ImmHklList, ImmHkl, entry)
     {
         list_remove(&ptr->entry);
         if (ptr->hIME)