diff --git a/ChangeLog b/ChangeLog
index 4849aa034..4bc8ceda4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2005-12-05 Michal Čihař  <michal@cihar.com>
     * many files: Use same script tag, use CDATA for scripts (RFE #995065).
+    * export.php: Check for correct parameters.
 
 2005-12-04 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/catalan update, thanks to Xavier Navarro (xavin).
diff --git a/export.php b/export.php
index 7790a7fb1..6c48e006e 100644
--- a/export.php
+++ b/export.php
@@ -8,7 +8,7 @@
 require_once('./libraries/common.lib.php');
 require_once('./libraries/zip.lib.php');
 
-PMA_checkParameters(array('what'));
+PMA_checkParameters(array('what', 'export_type'));
 
 // What type of export are we doing?
 if ($what == 'excel') {
@@ -23,10 +23,12 @@ require('./libraries/export/' . PMA_securePath($type) . '.php');
 // Generate error url
 if ($export_type == 'server') {
     $err_url = 'server_export.php?' . PMA_generate_common_url();
-} elseif ($export_type == 'database') {
+} elseif ($export_type == 'database' && !empty($db)) {
     $err_url = 'db_details_export.php?' . PMA_generate_common_url($db);
-} else {
+} elseif ($export_type == 'table' && !empty($db) && !empty($table)) {
     $err_url = 'tbl_properties_export.php?' . PMA_generate_common_url($db, $table);
+} else {
+    die('Bad parameters!');
 }
 
 /**