diff --git a/mods/CORE/_mcl_autogroup/init.lua b/mods/CORE/_mcl_autogroup/init.lua
index 4d8ab35b8..c0c5021b5 100644
--- a/mods/CORE/_mcl_autogroup/init.lua
+++ b/mods/CORE/_mcl_autogroup/init.lua
@@ -300,6 +300,10 @@ end
 -- loading order.
 function mcl_autogroup.get_wear(toolname, diggroup)
 	local tdef = minetest.registered_tools[toolname]
+	if not tdef then
+		minetest.log("warning", "Adding wear for tool: " .. tostring(toolname) .. " failed with diggroup: " .. tostring(diggroup))
+		return nil
+	end
 	local uses = tdef._mcl_diggroups[diggroup].uses
 	return math.ceil(65535 / uses)
 end
diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua
index 9f8afdc89..5846f8942 100644
--- a/mods/ITEMS/mcl_tools/init.lua
+++ b/mods/ITEMS/mcl_tools/init.lua
@@ -183,7 +183,9 @@ local make_grass_path = function(itemstack, placer, pointed_thing)
 				-- Add wear (as if digging a shovely node)
 				local toolname = itemstack:get_name()
 				local wear = mcl_autogroup.get_wear(toolname, "shovely")
-				itemstack:add_wear(wear)
+				if wear then
+					itemstack:add_wear(wear)
+				end
 			end
 			minetest.sound_play({name="default_grass_footstep", gain=1}, {pos = above}, true)
 			minetest.swap_node(pointed_thing.under, {name="mcl_core:grass_path"})
@@ -212,7 +214,10 @@ if minetest.get_modpath("mcl_farming") then
 				-- Add wear (as if digging a shearsy node)
 				local toolname = itemstack:get_name()
 				local wear = mcl_autogroup.get_wear(toolname, "shearsy")
-				itemstack:add_wear(wear)
+				if wear then
+					itemstack:add_wear(wear)
+				end
+
 			end
 			minetest.sound_play({name="default_grass_footstep", gain=1}, {pos = pointed_thing.above}, true)
 			local dir = vector.subtract(pointed_thing.under, pointed_thing.above)
@@ -379,7 +384,9 @@ local function make_stripped_trunk(itemstack, placer, pointed_thing)
 			-- Add wear (as if digging a axey node)
 			local toolname = itemstack:get_name()
 			local wear = mcl_autogroup.get_wear(toolname, "axey")
-			itemstack:add_wear(wear)
+			if wear then
+				itemstack:add_wear(wear)
+			end
 		end
 	end
     return itemstack