diff --git a/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h b/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h
index cc911ab73b..5350e489a4 100644
--- a/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h
+++ b/legacy/ecore/src/lib/ecore_win32/Ecore_Win32.h
@@ -309,6 +309,7 @@ EAPI extern int ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST;
 
 
 /* Core */
+
 EAPI int    ecore_win32_init();
 EAPI int    ecore_win32_shutdown();
 EAPI double ecore_win32_current_time_get(void);
diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
index ef6830e73b..d0d8df1d81 100644
--- a/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
+++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32.c
@@ -299,7 +299,7 @@ ecore_win32_init()
      }
 
    printf (" *** ecore_win32_init\n");
-   _ecore_win32_instance = GetModuleHandle(0);
+   _ecore_win32_instance = GetModuleHandle(NULL);
    if (!_ecore_win32_instance)
      return 0;
 
@@ -317,7 +317,6 @@ ecore_win32_init()
 
    if(!RegisterClass(&wc))
      {
-        UnregisterClass(ECORE_WIN32_WINDOW_CLASS, _ecore_win32_instance);
         FreeLibrary(_ecore_win32_instance);
         return 0;
      }