diff --git a/ChangeLog b/ChangeLog
index b08e0c30b..804832410 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-13 Alexander M. Turek  <me@derrabus.de>
+    * libraries/dbi/mysqli.dbi.lib.php: avoid php errors if result set is
+      FALSE.
+
 2004-07-12 Marc Delisle  <lem9@users.sourceforge.net>
     * all themes/colors.inc.php, libraries/common.lib.php,
       config.inc.php, Documentation.html: rename colors.inc.php to
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index ef47a5be7..102101e45 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -123,9 +123,9 @@ function PMA_mysqli_fetch_array($result, $type = FALSE) {
     global $cfg, $allow_recoding, $charset, $convcharset;
 
     if ($type != FALSE) {
-        $data = mysqli_fetch_array($result, $type);
+        $data = @mysqli_fetch_array($result, $type);
     } else {
-        $data = mysqli_fetch_array($result);
+        $data = @mysqli_fetch_array($result);
     }
 
     /* No data returned => do not touch it */