Added checking for null armor