Another null fix for armor.