diff --git a/mods/ITEMS/mcl_beds/functions.lua b/mods/ITEMS/mcl_beds/functions.lua
index 86f6a6852..545b03be7 100644
--- a/mods/ITEMS/mcl_beds/functions.lua
+++ b/mods/ITEMS/mcl_beds/functions.lua
@@ -6,6 +6,8 @@ local player_in_bed = 0
 local is_sp = minetest.is_singleplayer()
 local weather_mod = minetest.get_modpath("mcl_weather") ~= nil
 local explosions_mod = minetest.get_modpath("mcl_explosions") ~= nil
+local spawn_mod = minetest.get_modpath("mcl_spawn")
+local worlds_mod = minetest.get_modpath("mcl_worlds")
 
 -- Helper functions
 
@@ -76,7 +78,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
 		bed_center = {x = bed_pos.x - dir.x/2, y = bed_pos.y + 0.1, z = bed_pos.z - dir.z/2}
 
 		-- save respawn position when entering bed
-		if minetest.get_modpath("mcl_spawn") and mcl_spawn.set_spawn_pos(player, bed_pos, false) then
+		if spawn_mod and mcl_spawn.set_spawn_pos(player, bed_pos, nil) then
 			minetest.chat_send_player(name, S("New respawn position set!"))
 		end
 
@@ -297,7 +299,7 @@ function mcl_beds.on_rightclick(pos, player, is_top)
 	if player:get_meta():get_string("mcl_beds:sleeping") == "true" then
 		return
 	end
-	if minetest.get_modpath("mcl_worlds") then
+	if worlds_mod then
 		local dim = mcl_worlds.pos_to_dimension(pos)
 		if dim == "nether" or dim == "end" then
 			-- Bed goes BOOM in the Nether or End.