diff --git a/mods/3d_armor/3d_armor/armor.lua b/mods/3d_armor/3d_armor/armor.lua
index e95a8ed9..b7e26d99 100755
--- a/mods/3d_armor/3d_armor/armor.lua
+++ b/mods/3d_armor/3d_armor/armor.lua
@@ -545,7 +545,7 @@ minetest.register_on_joinplayer(function(player)
 		end, player)
 	end
 end)
-
+--[[
 if ARMOR_DROP == true or ARMOR_DESTROY == true then
 	armor.drop_armor = function(pos, stack)
 		local obj = minetest.add_item(pos, stack)
@@ -602,6 +602,7 @@ if ARMOR_DROP == true or ARMOR_DESTROY == true then
 		end
 	end)
 end
+--]]
 
 minetest.register_on_player_hpchange(function(player, hp_change)
 	local name, player_inv, armor_inv = armor:get_valid_player(player, "[on_hpchange]")
diff --git a/mods/unified_inventory/bags.lua b/mods/unified_inventory/bags.lua
index ec3e95f7..29e139ad 100755
--- a/mods/unified_inventory/bags.lua
+++ b/mods/unified_inventory/bags.lua
@@ -311,7 +311,11 @@ function unified_inventory.extract_bag(player, id)
 	end
 
 	pinv:remove_item("bag" .. id, stack)
-	minetest.get_inventory({type = "detached", name = minetest.formspec_escape(player:get_player_name()) .. "_bags"}):set_stack("bag" .. id, 1, nil)
+	local dinv = minetest.get_inventory({type = "detached", name = minetest.formspec_escape(player:get_player_name()) .. "_bags"})
+	if dinv then
+		dinv:set_stack("bag" .. id, 1, nil)
+	end	
+	
 	pinv:set_list("bag" .. id .. "contents", {})
 
 	stack:set_metadata(minetest.serialize(list))