diff --git a/lua/weapons/disguiser/init.lua b/lua/weapons/disguiser/init.lua
index 4baff79..7877c30 100644
--- a/lua/weapons/disguiser/init.lua
+++ b/lua/weapons/disguiser/init.lua
@@ -387,5 +387,7 @@ end
 
 function SWEP:OnRemove()
 	// Do you want to get stuck as a prop forever? NO.
-	self:Undisguise()
+	if !!self && IsValid(self.Owner) && self.Owner:Alive() then
+		self:Undisguise()
+	end
 end