diff --git a/garrysmod/gamemodes/sandbox/entities/weapons/gmod_camera.lua b/garrysmod/gamemodes/sandbox/entities/weapons/gmod_camera.lua
index ca7d7e43a5..dbc872a7b5 100644
--- a/garrysmod/gamemodes/sandbox/entities/weapons/gmod_camera.lua
+++ b/garrysmod/gamemodes/sandbox/entities/weapons/gmod_camera.lua
@@ -271,7 +271,7 @@ end
 --
 function SWEP:Equip()
 
-	if ( self:GetZoom() == 70 ) then
+	if ( self:GetZoom() == 70 && self.Owner:IsPlayer() ) then
 		self:SetZoom( self.Owner:GetInfoNum( "fov_desired", 75 ) )
 	end
 
diff --git a/garrysmod/lua/weapons/weapon_fists.lua b/garrysmod/lua/weapons/weapon_fists.lua
index 4d80463756..b3661d9709 100644
--- a/garrysmod/lua/weapons/weapon_fists.lua
+++ b/garrysmod/lua/weapons/weapon_fists.lua
@@ -160,7 +160,7 @@ end
 
 function SWEP:OnRemove()
 	
-	if ( IsValid( self.Owner ) ) then
+	if ( IsValid( self.Owner ) && CLIENT && self.Owner:IsPlayer() ) then
 		local vm = self.Owner:GetViewModel()
 		if ( IsValid( vm ) ) then vm:SetMaterial( "" ) end
 	end