diff --git a/ChangeLog b/ChangeLog
index 2324b1c60..ff683ff35 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-01-11 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/dbi/mysqli.dbi.lib.php: bug #1076213, headers sent
+      on invalid login
+
 2005-01-10 Michal Čihař  <michal@cihar.com>
      * lang/czech: Fix typo (translation #1099459).
 
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 4020f0f21..5e1f3fe19 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -189,7 +189,7 @@ function PMA_DBI_getError($link = NULL) {
     if (mysqli_connect_errno()) {
         $error = mysqli_connect_errno();
         $error_message = mysqli_connect_error();
-    } elseif (mysqli_errno($link)) {
+    } elseif ( !empty($link) && mysqli_errno($link)) {
         $error = mysqli_errno($link);
         $error_message = mysqli_error($link);
     }