diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index e3da57fdfb..ed1dab4fd8 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -46,6 +46,11 @@ class acp_database
 						$format	= request_var('method', '');
 						$where	= request_var('where', '');
 
+						if (!sizeof($table))
+						{
+							trigger_error($user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action));
+						}
+
 						$store = $download = $structure = $schema_data = false;
 
 						if ($where == 'store_and_download' || $where == 'store')
@@ -144,7 +149,7 @@ class acp_database
 							}
 						}
 
-						$extractor->write_end($table_name);
+						$extractor->write_end();
 
 						if ($download == true)
 						{
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index 07605cc4cb..a59ebc416f 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -62,6 +62,7 @@ $lang = array_merge($lang, array(
 	'STRUCTURE_ONLY'		=> 'Structure only',
 
 	'TABLE_SELECT'		=> 'Table select',
+	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',
 ));
 
 ?>
\ No newline at end of file