another NPE
Merge remote-tracking branch 'upstream/partial_armorset'

FIX #2