From 82a870d9dc1e9b57cccbc3ac3bff707ce3663f0c Mon Sep 17 00:00:00 2001
From: Kieran Huggins <kieran@kieran.ca>
Date: Tue, 20 Oct 2015 18:33:23 -0400
Subject: [PATCH] add guard against including associations for nil objects

---
 lib/active_model/serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
index c202610e..ef47178b 100644
--- a/lib/active_model/serializer.rb
+++ b/lib/active_model/serializer.rb
@@ -361,7 +361,7 @@ module ActiveModel
         _serializable_hash
       end
 
-      include_associations! if _embed
+      include_associations! if @object.present? && _embed
       @node
     end