diff --git a/src/libply-splash-core/ply-boot-splash.c b/src/libply-splash-core/ply-boot-splash.c
index e853e1f5..87a7a0c3 100644
--- a/src/libply-splash-core/ply-boot-splash.c
+++ b/src/libply-splash-core/ply-boot-splash.c
@@ -401,16 +401,17 @@ ply_boot_splash_free (ply_boot_splash_t *splash)
                                                        splash);
         }
 
-        ply_boot_splash_unset_keyboard (splash);
+        if (splash->module_handle != NULL) {
+                ply_boot_splash_unset_keyboard (splash);
 
-        remove_pixel_displays (splash);
-        ply_list_free (splash->pixel_displays);
+                remove_pixel_displays (splash);
+                ply_list_free (splash->pixel_displays);
 
-        remove_text_displays (splash);
-        ply_list_free (splash->text_displays);
+                remove_text_displays (splash);
+                ply_list_free (splash->text_displays);
 
-        if (splash->module_handle != NULL)
                 ply_boot_splash_unload (splash);
+        }
 
         if (splash->idle_trigger != NULL)
                 ply_trigger_free (splash->idle_trigger);