diff --git a/ChangeLog b/ChangeLog
index 45b6392ee..282054a20 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-06-24 Alexander M. Turek  <me@derrabus.de>
+    * libraries/dbi/mysqli.dbi.php: Undefined variable if PMA_DBI_getError() is
+      called although no error occured.
+
 2004-06-24 Michal Čihař  <michal@cihar.com>
     * main.php, changelog.php: Add headers to ChangeLog display.
     * scripts/create_tables.sql: Add IF EXISTS.
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 628d1fce6..ef47a5be7 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -197,7 +197,7 @@ function PMA_DBI_getError($link = NULL) {
     } 
 
     // keep the error number for further check after the call to PMA_DBI_getError()
-    if ($error) {
+    if (!empty($error)) {
         $GLOBALS['errno'] = $error;
     } else {
         return FALSE;