diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index 0376e87e..57eec287 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -548,7 +548,7 @@ function PMA_pluginGetOptions($section, &$list)
         $ret .= '<h3>' . PMA_getString($text) . '</h3>';
 
         $no_options = true;
-        if ($options != null && count($options) > 0) {
+        if ($options != null && is_array($options) && count($options) > 0) {
             foreach ($options->getProperties()
                 as $propertyMainGroup
             ) {
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index c6145266..ca0707df 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -610,7 +610,7 @@ function PMA_isRememberSortingOrder($analyzed_sql_results)
             || $analyzed_sql_results['is_analyse'])
         && $analyzed_sql_results['select_from']
         && ((empty($analyzed_sql_results['select_expr']))
-            || (count($analyzed_sql_results['select_expr'] == 1)
+            || ((count($analyzed_sql_results['select_expr']) == 1)
                 && ($analyzed_sql_results['select_expr'][0] == '*')))
         && count($analyzed_sql_results['select_tables']) == 1;
 }