add guard against including associations for nil objects

rails-api · Mar 16, 2016 · 82a870d · 82a870d
1 parent b2dc259
commit 82a870d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
@@ -361,7 +361,7 @@ def serializable_hash
         _serializable_hash
       end
 
-      include_associations! if _embed
+      include_associations! if @object.present? && _embed
       @node
     end