Fixed an NPE (or two) in the armor