diff --git a/ChangeLog b/ChangeLog
index def4ce684..a1eb1f5d8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-05-25 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties.inc.php: bug #1207404, undefined variables
+
 2005-05-24 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1207395, undefined theme_generation
       and theme_version, thanks to Ryan Schmidt
diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php
index 7621fc4ff..c82e38fca 100644
--- a/tbl_properties.inc.php
+++ b/tbl_properties.inc.php
@@ -345,7 +345,7 @@ for ($i = 0 ; $i < $num_fields; $i++) {
     // here, we have a TIMESTAMP that SHOW FULL FIELDS reports as having the
     // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
     // the latter.
-    if ($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP' && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == TRUE) {
+    if (isset($row['Field']) && isset($analyzed_sql[0]) && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP' && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == TRUE) {
         $row['Null'] = '';
     }