diff --git a/core/translate/insert.rs b/core/translate/insert.rs
index 7e7317271..0455d56fc 100644
--- a/core/translate/insert.rs
+++ b/core/translate/insert.rs
@@ -741,13 +741,16 @@ fn build_insertion<'a>(
 
     if columns.is_none() {
         // Case 1: No columns specified - map values to columns in order
+        if num_values != table_columns.iter().filter(|c| !c.hidden).count() {
+            crate::bail_parse_error!(
+                "table {} has {} columns but {} values were supplied",
+                &table.get_name(),
+                table_columns.len(),
+                num_values
+            );
+        }
         let mut value_idx = 0;
         for (i, col) in table_columns.iter().enumerate() {
-            if value_idx == num_values {
-                // If there are less values than columns, the rest will have value_index = None,
-                // meaning NULLs will be emitted for them.
-                break;
-            }
             if col.hidden {
                 // Hidden columns are not taken into account.
                 continue;
@@ -763,15 +766,6 @@ fn build_insertion<'a>(
             }
             value_idx += 1;
         }
-
-        if value_idx != num_values {
-            crate::bail_parse_error!(
-                "table {} has {} columns but {} values were supplied",
-                &table.get_name(),
-                num_values,
-                value_idx
-            );
-        }
     } else {
         // Case 2: Columns specified - map named columns to their values
         // Map each named column to its value index