diff --git a/src/Parse/ParseQuery.php b/src/Parse/ParseQuery.php
index 32b30658..26538cb5 100644
--- a/src/Parse/ParseQuery.php
+++ b/src/Parse/ParseQuery.php
@@ -624,12 +624,11 @@ public function find($useMasterKey = false, $decodeObjects = true)
             null,
             $useMasterKey
         );
+        if (!isset($result['results'])) {
+            return [];
+        }
         if (!$decodeObjects) {
-            if (array_key_exists('results', $result)) {
-                return $result['results'];
-            } else {
-                return [];
-            }
+            return $result['results'];
         }
         $output = [];
         foreach ($result['results'] as $row) {
diff --git a/tests/Parse/Helper.php b/tests/Parse/Helper.php
index e85cac23..56333238 100644
--- a/tests/Parse/Helper.php
+++ b/tests/Parse/Helper.php
@@ -52,7 +52,7 @@ public static function setUp()
         self::setHttpClient();
     }
 
-    public static function setHttpClient($httpClient = null)
+    public static function setHttpClient()
     {
         //
         // Set a curl http client to run primary tests under
@@ -61,9 +61,6 @@ public static function setHttpClient($httpClient = null)
         // ParseCurlHttpClient
         // ParseStreamHttpClient
         //
-        if ($httpClient) {
-            return ParseClient::setHttpClient($httpClient);
-        }
 
         global $USE_CLIENT_STREAM;
 
diff --git a/tests/Parse/ParseQueryTest.php b/tests/Parse/ParseQueryTest.php
index 4bebd9bf..02f3f1c9 100644
--- a/tests/Parse/ParseQueryTest.php
+++ b/tests/Parse/ParseQueryTest.php
@@ -7,6 +7,7 @@
 use Parse\ParseObject;
 use Parse\ParseQuery;
 use Parse\ParseUser;
+use Parse\ParseClient;
 
 class ParseQueryTest extends \PHPUnit_Framework_TestCase
 {
@@ -2402,19 +2403,28 @@ public function testQueryFindEncoded()
         $this->assertEquals('John', $results[2]['name']);
     }
 
-    public function testQueryFindEncodedInvalidResponse()
+    public function testQueryNullResponse()
     {
         $obj = new ParseObject('TestObject');
         $obj->set('name', 'John');
         $obj->set('country', 'US');
         $obj->save();
 
+        ParseClient::initialize(
+            Helper::$appId,
+            Helper::$restKey,
+            Helper::$masterKey,
+            false,
+            Helper::$accountKey
+        );
+        ParseClient::setServerURL('http://localhost:1337', 'parse');
+
         $httpClient = new HttpClientMock();
         $httpClient->setResponse('{}');
-        Helper::setHttpClient($httpClient);
+        ParseClient::setHttpClient($httpClient);
 
         $query = new ParseQuery('TestObject');
-        $results = $query->find(false, false);
+        $results = $query->find(false);
 
         $this->assertEquals(0, count($results));