diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 5712c15d6..6039232af 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -424,9 +424,15 @@ class PMA_Table
             if (! $force_exact) {
                 if (! isset(PMA_Table::$cache[$db][$table]['Rows']) && ! $is_view) {
                     $tmp_tables = PMA_DBI_get_tables_full($db, $table);
-                    PMA_Table::$cache[$db][$table] = $tmp_tables[$table];
+                    if (isset($tmp_tables[$table])) {
+                        PMA_Table::$cache[$db][$table] = $tmp_tables[$table];
+                    }
+                }
+                if (isset(PMA_Table::$cache[$db][$table]['Rows'])) {
+                    $row_count = PMA_Table::$cache[$db][$table]['Rows'];
+                } else {
+                    $row_count = false;
                 }
-                $row_count = PMA_Table::$cache[$db][$table]['Rows'];
             }
 
             // for a VIEW, $row_count is always false at this point