diff --git a/views/plugins/views_plugin_query_default.inc b/views/plugins/views_plugin_query_default.inc
index 1839419..8e5b448 100644
--- a/views/plugins/views_plugin_query_default.inc
+++ b/views/plugins/views_plugin_query_default.inc
@@ -921,6 +921,7 @@ class views_plugin_query_default extends views_plugin_query{
     $fields = $distinct = array();
     $non_aggregates = array();
 
+    if($fields_array) {
     foreach ($fields_array as $field) {
       $string = '';
       if (!empty($field['table'])) {
@@ -970,6 +971,7 @@ class views_plugin_query_default extends views_plugin_query{
         break;
       }
     }
+    }
     return array(
       $distinct,
       $fields,
@@ -996,7 +998,7 @@ class views_plugin_query_default extends views_plugin_query{
      * Determine of this query qualifies by checking for a groupby or distinct.
      */
     $fields_array = $this->fields;
-    if ($get_count && !$this->groupby) {
+    if ($get_count && !$this->groupby && $fields_array) {
       foreach ($fields_array as $field) {
         if (!empty($field['distinct']) || !empty($field['function'])) {
           $get_count_optimized = FALSE;