diff --git a/addon.json b/addon.json
index ffa1f39..337e7cb 100644
--- a/addon.json
+++ b/addon.json
@@ -6,6 +6,6 @@
 	[
 		"*.txt",
 		"*.md",
-		".git"
+		"*.yml"
 	]
 }
diff --git a/lua/ulx/modules/sh/sh_kyle_buildmode.lua b/lua/ulx/modules/sh/sh_kyle_buildmode.lua
index 3d18340..541ee56 100644
--- a/lua/ulx/modules/sh/sh_kyle_buildmode.lua
+++ b/lua/ulx/modules/sh/sh_kyle_buildmode.lua
@@ -175,6 +175,8 @@ local function _kyle_Prop_TryUnNoclip(z)
 end
 
 local function _kyle_Prop_Noclip_Sub(z)
+	if not IsEntity(z) then return end
+
 	--Exit if we are already un noclipd
 	if z:GetNWBool("_kyle_noclip") then return end