diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index a4b1c66db..55dd94209 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -601,6 +601,9 @@ function PMA_DBI_get_fields($database, $table, $link = null)
         'SHOW FULL COLUMNS
         FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table),
         null, null, $link);
+    if ( ! is_array($fields) || count($fields) < 1 ) {
+        return false;
+    }
     return $fields;
 }