I am such a derp :P - fixed the Armor NPE
* sorry guys again...