diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c
index bef4a4549c..5ee45dcf2a 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -224,7 +224,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-  eina_log_domain_unregister(_evas_engine_buffer_log_dom);
+   if (_evas_engine_buffer_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_buffer_log_dom);
+        _evas_engine_buffer_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c
index d712093acc..f709592ef3 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -172,7 +172,11 @@ static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
    /* unregister the eina log domain for this engine */
-   eina_log_domain_unregister(_evas_engine_drm_log_dom);
+   if (_evas_engine_drm_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_drm_log_dom);
+        _evas_engine_drm_log_dom = -1;
+     }
 
    ecore_shutdown();
 }
diff --git a/src/modules/evas/engines/eglfs/evas_engine.c b/src/modules/evas/engines/eglfs/evas_engine.c
index c881f29238..abd2c4b92d 100644
--- a/src/modules/evas/engines/eglfs/evas_engine.c
+++ b/src/modules/evas/engines/eglfs/evas_engine.c
@@ -1234,8 +1234,11 @@ static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
    /* unregister the eina log domain for this engine */
-   eina_log_domain_unregister(_evas_engine_eglfs_log_dom);
-   _evas_engine_eglfs_log_dom = -1;
+   if (_evas_engine_eglfs_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_eglfs_log_dom);
+        _evas_engine_eglfs_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c
index 3156b95a78..204a614688 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -235,7 +235,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-  eina_log_domain_unregister(_evas_engine_fb_log_dom);
+   if (_evas_engine_fb_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_fb_log_dom);
+        _evas_engine_fb_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c
index ae19d1a518..144dcbdc4f 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -1467,8 +1467,11 @@ static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
    /* unregister the eina log domain for this engine */
-   eina_log_domain_unregister(_evas_engine_gl_drm_log_dom);
-   _evas_engine_gl_drm_log_dom = -1;
+   if (_evas_engine_gl_drm_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_gl_drm_log_dom);
+        _evas_engine_gl_drm_log_dom = -1;
+     }
 
    ecore_shutdown();
 }
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index 899a2a7a93..8cff9b926f 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -3262,7 +3262,11 @@ static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
    ector_shutdown();
-   eina_log_domain_unregister(_evas_engine_GL_log_dom);
+   if (_evas_engine_GL_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_GL_log_dom);
+        _evas_engine_GL_log_dom = -1;
+     }
    evas_gl_common_module_close();
 }
 
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index 1a43ae5d23..e722eee1d2 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -423,7 +423,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-    eina_log_domain_unregister(_evas_engine_GL_SDL_log_dom);
+   if (_evas_engine_GL_SDL_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_GL_SDL_log_dom);
+        _evas_engine_GL_SDL_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index 2d4fde9f86..49d192eb35 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -3184,7 +3184,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-    eina_log_domain_unregister(_evas_engine_GL_X11_log_dom);
+   if (_evas_engine_GL_X11_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_GL_X11_log_dom);
+        _evas_engine_GL_X11_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c
index 1d9ec1e96a..be5f808273 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.c
+++ b/src/modules/evas/engines/psl1ght/evas_engine.c
@@ -482,7 +482,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-   eina_log_domain_unregister(_evas_engine_psl1ght_log_dom);
+   if (_evas_engine_psl1ght_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_psl1ght_log_dom);
+        _evas_engine_psl1ght_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c
index 75b37bac04..3d6834c663 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -186,7 +186,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-  eina_log_domain_unregister(_evas_log_dom_module);
+   if (_evas_log_dom_module >= 0)
+     {
+        eina_log_domain_unregister(_evas_log_dom_module);
+        _evas_log_dom_module = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c
index d57e92cec1..be226f7a02 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -195,8 +195,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-  eina_log_domain_unregister(_evas_engine_soft_gdi_log_dom);
-  _evas_engine_soft_gdi_log_dom = -1;
+   if (_evas_engine_soft_gdi_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_soft_gdi_log_dom);
+        _evas_engine_soft_gdi_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 66a2d0b21a..baf3e46d8d 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -5878,7 +5878,11 @@ module_close(Evas_Module *em EINA_UNUSED)
    eina_mempool_del(_mp_command_font);
    eina_mempool_del(_mp_command_map);
    eina_mempool_del(_mp_command_ector);
-   eina_log_domain_unregister(_evas_soft_gen_log_dom);
+   if (_evas_soft_gen_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_soft_gen_log_dom);
+        _evas_soft_gen_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index 6ef80b4939..fd61bc0868 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -682,7 +682,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-  eina_log_domain_unregister(_evas_engine_soft_x11_log_dom);
+   if (_evas_engine_soft_x11_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_soft_x11_log_dom);
+        _evas_engine_soft_x11_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 94c4316e64..64bed02898 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -1423,7 +1423,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-   eina_log_domain_unregister(_evas_engine_wl_egl_log_dom);
+   if (_evas_engine_wl_egl_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_wl_egl_log_dom);
+        _evas_engine_wl_egl_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 1fe45ecc7c..b00c6148e1 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -415,11 +415,11 @@ module_close(Evas_Module *em EINA_UNUSED)
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
    /* unregister logging domain */
-   if (_evas_engine_way_shm_log_dom > -1)
-     eina_log_domain_unregister(_evas_engine_way_shm_log_dom);
-
-   /* reset logging domain variable */
-   _evas_engine_way_shm_log_dom = -1;
+   if (_evas_engine_way_shm_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_engine_way_shm_log_dom);
+        _evas_engine_way_shm_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi = 
diff --git a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
index 7645f2a6f5..4f7363d82b 100644
--- a/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
+++ b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c
@@ -823,7 +823,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-   eina_log_domain_unregister(_evas_loader_ico_log_dom);
+   if (_evas_loader_ico_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_loader_ico_log_dom);
+        _evas_loader_ico_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
index b20414b26b..a4ed27351f 100644
--- a/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
+++ b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c
@@ -392,8 +392,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-   eina_log_domain_unregister(_evas_loader_jp2k_log_dom);
-   _evas_loader_jp2k_log_dom = -1;
+   if (_evas_loader_jp2k_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_loader_jp2k_log_dom);
+        _evas_loader_jp2k_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
index 943c3e74b2..19b9aac7b2 100644
--- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
@@ -359,7 +359,11 @@ module_open(Evas_Module *em)
 static void
 module_close(Evas_Module *em EINA_UNUSED)
 {
-   eina_log_domain_unregister(_evas_loader_tiff_log_dom);
+   if (_evas_loader_tiff_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_loader_tiff_log_dom);
+        _evas_loader_tiff_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =
diff --git a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
index cf9b9df075..495795608b 100644
--- a/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
+++ b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c
@@ -726,7 +726,11 @@ module_close(Evas_Module *em EINA_UNUSED)
         eina_file_close(rgb_txt);
         rgb_txt = NULL;
      }
-   eina_log_domain_unregister(_evas_loader_xpm_log_dom);
+   if (_evas_loader_xpm_log_dom >= 0)
+     {
+        eina_log_domain_unregister(_evas_loader_xpm_log_dom);
+        _evas_loader_xpm_log_dom = -1;
+     }
 }
 
 static Evas_Module_Api evas_modapi =