Checkpoint: Added arming state check