fix null on weapon