Update for fixed null weapons.