diff --git a/ChangeLog b/ChangeLog
index 4ad968520..b25ff3a3a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ $Source$
     * libraries/sqlparser.lib.php, lang/*: Report syntax error when there is
       a broken comment (bug #905066).
     * db_details_structure.php: Fixed colspan.
+    * tbl_properties_table_info.php: Do not fail on broken table.
 
 2004-05-12 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details_structure.php: bug #951143, undefined $header_url_qry
diff --git a/tbl_properties_table_info.php b/tbl_properties_table_info.php
index c6f537331..4943c5a16 100644
--- a/tbl_properties_table_info.php
+++ b/tbl_properties_table_info.php
@@ -17,13 +17,13 @@ PMA_checkParameters(array('db', 'table'));
 // The 'show table' statement works correct since 3.23.03
 $table_info_result   = PMA_DBI_query('SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\';');
 $showtable           = PMA_DBI_fetch_assoc($table_info_result);
-$tbl_type            = strtoupper($showtable['Type']);
+$tbl_type            = isset($showtable['Type']) ? strtoupper($showtable['Type']) : '';
 $tbl_collation       = empty($showtable['Collation']) ? '' : $showtable['Collation'];
 $table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
 $show_comment        = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
 $auto_increment      = (isset($showtable['Auto_increment']) ? $showtable['Auto_increment'] : '');
 
-$tmp                 = explode(' ', $showtable['Create_options']);
+$tmp                 = isset($showtable['Create_options']) ? explode(' ', $showtable['Create_options']) : array();
 $tmp_cnt             = count($tmp);
 for ($i = 0; $i < $tmp_cnt; $i++) {
     $tmp1            = explode('=', $tmp[$i]);