diff --git a/lib/Serialization.php b/lib/Serialization.php index db0208808..c048efd3f 100644 --- a/lib/Serialization.php +++ b/lib/Serialization.php @@ -173,7 +173,11 @@ private function check_include() try { $assoc = $this->model->$association; - if (!is_array($assoc)) + if (is_null($assoc)) + { + $this->attributes[$association] = null; + } + elseif (!is_array($assoc)) { $serialized = new $serializer_class($assoc, $options); $this->attributes[$association] = $serialized->to_a();;