diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 700ce54cf95..b76fba83819 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -8191,6 +8191,15 @@ bool mysql_prepare_create_table(
                       &key_part_info, keys_to_check, key_number, file,
                       &auto_increment))
         return true;
+
+      /*
+      Any auto increment columns not found during prepare_key?
+      */
+      if (auto_increment > 0) {
+        my_error(ER_WRONG_AUTO_KEY, MYF(0));
+        return true;
+      }
+      
       key_info++;
       key_number++;
     }
@@ -8223,14 +8232,6 @@ bool mysql_prepare_create_table(
   if (!primary_key && check_promoted_index(file, *key_info_buffer, *key_count))
     return true;
 
-  /*
-    Any auto increment columns not found during prepare_key?
-  */
-  if (auto_increment > 0) {
-    my_error(ER_WRONG_AUTO_KEY, MYF(0));
-    return true;
-  }
-
   /* Sort keys in optimized order */
   std::sort(*key_info_buffer, *key_info_buffer + *key_count, sort_keys());