diff --git a/ChangeLog b/ChangeLog
index 86711df0f..983988faa 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ $Source$
 
 2002-08-26 Michal Cihar  <nijel@users.sourceforge.net>
     * lang/czech-*.inc.php3: Updates, fixes.
-    
+
 2002-08-26 Loïc Chapeaux  <lolo@phpheaven.net>
     * tbl_indexes.php3: Another fix against the Zend Accelerator bug (#571409).
 
@@ -16,6 +16,7 @@ $Source$
     * lang/german-*.inc.php3: Updates.
     * libraries/sqlvalidator.lib.php3, lang/*.inc.php3:
       Better fix against bug #594947.
+    * libraries/common.lib.php3: Fixed a JS error.
 
 2002-08-24 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html, faq 6.15: creating an index on a BLOB field
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 81362a43e..6ebd76798 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -1058,7 +1058,7 @@ if (typeof(window.parent) != 'undefined'
         }
 
         // Corrects the tooltip text via JS if required
-        else if (isset($GLOBALS['table']) && $cfg['ShowTooltip'] && PMA_MYSQL_INT_VERSION >= 32303) {
+        else if (isset($GLOBALS['table']) && !empty($GLOBALS['table']) && $cfg['ShowTooltip'] && PMA_MYSQL_INT_VERSION >= 32303) {
             $result = @PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($GLOBALS['db']) . ' LIKE \'' . PMA_sqlAddslashes($GLOBALS['table'], TRUE) . '\'');
             if ($result) {
                 $tbl_status = PMA_mysql_fetch_array($result, MYSQL_ASSOC);