diff --git a/board/src/piece_sets.rs b/board/src/piece_sets.rs
index de43caa..52af054 100644
--- a/board/src/piece_sets.rs
+++ b/board/src/piece_sets.rs
@@ -51,11 +51,10 @@ impl PieceSet {
                 color_occupancy[color_index] |= bitboard;
                 shape_occupancy[shape_index] |= bitboard;
 
-                counts.increment(color, shape);
-
                 for square in bitboard.occupied_squares(&IterationDirection::default()) {
                     let piece = Piece::new(color, shape);
                     mailbox.set(piece, square);
+                    counts.increment(color, shape);
                 }
             }
         }
diff --git a/board/src/piece_sets/counts.rs b/board/src/piece_sets/counts.rs
index effbbe0..7d3cade 100644
--- a/board/src/piece_sets/counts.rs
+++ b/board/src/piece_sets/counts.rs
@@ -17,20 +17,21 @@ impl Counts {
         const SQUARE_NUM: u8 = Square::NUM as u8;
 
         let updated_value = self.0[color as usize][shape as usize] + 1;
-        if updated_value <= SQUARE_NUM {
-            self.0[color as usize][shape as usize] = updated_value;
-        } else {
-            unreachable!("piece count for {color} {shape} overflowed");
+        if updated_value > SQUARE_NUM {
+            let shape_name = shape.name();
+            panic!("piece count for {color} {shape_name} overflowed");
         }
+
+        self.0[color as usize][shape as usize] = updated_value;
     }
 
     pub fn decrement(&mut self, color: Color, shape: Shape) {
         let count = self.0[color as usize][shape as usize];
-        if let Some(updated_count) = count.checked_sub(1) {
-            self.0[color as usize][shape as usize] = updated_count;
-        } else {
-            unreachable!("piece count for {color} {shape} underflowed");
-        }
+        let updated_count = count.checked_sub(1).unwrap_or_else(|| {
+            let shape_name = shape.name();
+            panic!("piece count for {color} {shape_name} should not underflow");
+        });
+        self.0[color as usize][shape as usize] = updated_count;
     }
 
     #[cfg(test)]