From 9d24547a46f4c379d7a8ad968fb9e84a04351bb4 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Wed, 21 Mar 2012 11:09:49 +0100
Subject: [PATCH] Add extra nil check

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

diff --git a/lib/mongoid/relations.rb b/lib/mongoid/relations.rb
index 07b5103411..8b16b020e0 100644
--- a/lib/mongoid/relations.rb
+++ b/lib/mongoid/relations.rb
@@ -119,7 +119,7 @@ def referenced_one?
     def reload_relations
       relations.each_pair do |name, meta|
         if instance_variable_defined?("@#{name}")
-          unless instance_variable_get("@#{name}") == _parent
+          if _parent.nil? || instance_variable_get("@#{name}") != _parent
             remove_instance_variable("@#{name}")
           end
         end