diff --git a/mods/builtin_item/init.lua b/mods/builtin_item/init.lua
index cd58665faf..b74759dabb 100644
--- a/mods/builtin_item/init.lua
+++ b/mods/builtin_item/init.lua
@@ -94,7 +94,7 @@ minetest.register_entity(":__builtin:item", {
 		local p = self.object:getpos()
 		
 		local name = minetest.get_node(p).name
-		if minetest.registered_nodes[name].damage_per_second > 0 or name == "maptools:igniter" then
+		if (minetest.registered_nodes[name] and minetest.registered_nodes[name].damage_per_second > 0) or name == "maptools:igniter" then
 			minetest.sound_play("builtin_item_lava", {pos = self.object:getpos(), gain = 0.5})
 			self.object:remove()
 			return
@@ -107,7 +107,7 @@ minetest.register_entity(":__builtin:item", {
 		end
 		--]]
 		
-		if minetest.registered_nodes[name].liquidtype == "flowing" then
+		if minetest.registered_nodes[name] and minetest.registered_nodes[name].liquidtype == "flowing" then
 			get_flowing_dir = function(self)
 				local pos = self.object:getpos()
 				local param2 = minetest.get_node(pos).param2