Merge branch 'develop'

restcord · Jan 31, 2018 · 6da3ec7 · 6da3ec7
2 parents 8997142 + 0a7ec59
commit 6da3ec7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/DiscordClient.php b/src/DiscordClient.php
@@ -270,6 +270,9 @@ private function convertResponseToResult(
         if (!class_exists($class)) {
             return new Result($data);
         }
+        if ($data === null) {
+            return new Result([]);
+        }
 
         $mapper                   = new \JsonMapper();
         $mapper->bStrictNullTypes = false;