diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 540271bc961..2c7ccbf3e2b 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -26304,7 +26304,8 @@ AGGR_OP::put_record(bool end_of_records)
 {
   // Lasy tmp table creation/initialization
   if (!join_tab->table->file->inited)
-    prepare_tmp_table();
+    if (prepare_tmp_table())
+      return NESTED_LOOP_ERROR;
   enum_nested_loop_state rc= (*write_func)(join_tab->join, join_tab,
                                            end_of_records);
   return rc;