diff --git a/db_datadict.php3 b/db_datadict.php3
index fd3d07a6b..e02d2ac08 100644
--- a/db_datadict.php3
+++ b/db_datadict.php3
@@ -19,6 +19,10 @@ require('./libraries/transformations.lib.php3');
 
 $cfgRelation  = PMA_getRelationsParam();
 
+/**
+ * Check parameters
+ */
+PMA_checkParameters(array('db'));
 
 /**
  * Defines the url to return to in case of error in a sql statement
@@ -50,7 +54,11 @@ if ($cfgRelation['commwork']) {
  */
 PMA_mysql_select_db($db);
 $sql    = 'SHOW TABLES FROM ' . PMA_backquote($db);
-$rowset = mysql_query($sql);
+$rowset = @PMA_mysql_query($sql);
+
+if (!$rowset) {
+    exit();
+}
 $count  = 0;
 while ($row = mysql_fetch_array($rowset)) {
     if (PMA_MYSQL_INT_VERSION >= 32303) {