1 files changed, 7 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 62acad0eda..c26c469c1e 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -228,8 +228,8 @@ module ActiveRecord
         end
 
         def find_reflection(klass, name)
-          klass._reflect_on_association(name) or
-            raise ConfigurationError, "Can't join '#{ klass.name }' to association named '#{ name }'; perhaps you misspelled it?"
+          klass._reflect_on_association(name) ||
+            raise(ConfigurationError, "Can't join '#{klass.name}' to association named '#{name}'; perhaps you misspelled it?")
         end
 
         def build(associations, base_klass)
@@ -286,17 +286,19 @@ module ActiveRecord
         end
 
         def construct_model(record, node, row, model_cache, id, aliases)
-          model = model_cache[node][id] ||= node.instantiate(row,
-                                                             aliases.column_aliases(node))
           other = record.association(node.reflection.name)
 
+          model = model_cache[node][id] ||=
+            node.instantiate(row, aliases.column_aliases(node)) do |m|
+              other.set_inverse_instance(m)
+            end
+
           if node.reflection.collection?
             other.target.push(model)
           else
             other.target = model
           end
 
-          other.set_inverse_instance(model)
           model
         end
     end