Fixed another NPE with the armor contents