diff --git a/lua/weapons/disguiser/cl_fxfake.lua b/lua/weapons/disguiser/cl_fxfake.lua
index d6f6c40..d5803fb 100644
--- a/lua/weapons/disguiser/cl_fxfake.lua
+++ b/lua/weapons/disguiser/cl_fxfake.lua
@@ -26,14 +26,16 @@
  */
 
 usermessage.Hook("disguiserShootFX", function(um)
+	print("[Disguiser] Received disguiserShootFX")
+
 	local hitpos = um:ReadVector()
 	local hitnormal = um:ReadVectorNormal()
 	local entity = um:ReadEntity()
 	local physbone = um:ReadLong()
 	local bFirstTimePredicted = um:ReadBool()
 	
-	// Player and weapon valid?
-	if !IsValid(LocalPlayer()) || !IsValid(LocalPlayer():GetActiveWeapon()) || !!LocalPlayer():GetActiveWeapon().DoShootEffect then return false end
+	// Can we trigger shoot effect yet?
+	if !LocalPlayer():GetActiveWeapon().DoShootEffect then return false end
 	
 	// Render shoot effect
 	LocalPlayer():GetActiveWeapon("disguiser"):DoShootEffect(
diff --git a/lua/weapons/disguiser/sh_init.lua b/lua/weapons/disguiser/sh_init.lua
index 30e7a97..f13ed3a 100644
--- a/lua/weapons/disguiser/sh_init.lua
+++ b/lua/weapons/disguiser/sh_init.lua
@@ -115,7 +115,8 @@ end
 function SWEP:DoShootEffect(hitpos, hitnormal, entity, physbone, bFirstTimePredicted)
 
 	if SERVER then
-		umsg.Start("disguiserShootFX")
+		print("[Disguiser] Triggering disguiserShootFX on client " .. self.Owner:Name())
+		umsg.Start("disguiserShootFX", self.Owner)
 		umsg.Vector(hitpos)
 		umsg.VectorNormal(hitnormal)
 		umsg.Entity(entity)