Fixes for multiple NPEs being triggered on Weapon Updates

Signed-off-by: Andrew2060 <2060andrew@gmail.com>