Checkpoint: Added flag checks inside arming state update