diff --git a/ChangeLog b/ChangeLog
index 10310e269..737300cea 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-05-06 Garvin Hicking <pma@supergarv.de>
+    * libraries/display_tbl.lib.php: Bug #949087 - Fixed JS error for
+      mousepointer hovering on rows w/o checkboxes.
+
 2004-05-05 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_select.php: patch #939197, new choice of operator LIKE %...%
       because this syntax is so often used, thanks to Ruben Barkow (rubo77)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index f13c74688..bf2ce54cf 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1180,7 +1180,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
                 $column_style = '';
             }
 
-            $column_style .= ' onmousedown="document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked = (document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked ? false : true);" ';
+            $column_style .= ' onmousedown="if (document.getElementById(\'id_rows_to_delete' . $row_no . '\')) { document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked = (document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked ? false : true); }" ';
 
             // garvin: Wrap MIME-transformations. [MIME]
             $default_function = 'default_function'; // default_function