Merge 5943d84 into 8f00c66

spatie · Jun 20, 2017 · b944558 · b944558
2 parents 8f00c66 + 5943d84
commit b944558
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/Fractal.php b/src/Fractal.php
@@ -138,6 +138,10 @@ public function data($dataType, $data, $transformer = null)
      */
     protected function determineDataType($data)
     {
+        if (is_null($data)) {
+            return 'NullResource';
+        }
+
         if (is_array($data)) {
             return 'collection';
         }