diff --git a/lib/DBIx/Class/Relationship/Base.pm b/lib/DBIx/Class/Relationship/Base.pm
index b7e74eb58..49d830439 100644
--- a/lib/DBIx/Class/Relationship/Base.pm
+++ b/lib/DBIx/Class/Relationship/Base.pm
@@ -957,7 +957,8 @@ sub set_from_related {
     : ( ! defined blessed $f_obj )  ? $f_obj
                                     : do {
 
-        my $f_result_class = $self->result_source->related_source($rel)->result_class;
+        my $f_result_source = $self->result_source->related_source($rel);
+        my $f_result_class = $f_result_source->result_class;
 
         unless( $f_obj->isa($f_result_class) ) {
 
@@ -975,7 +976,22 @@ sub set_from_related {
           );
         }
 
-        +{ $f_obj->get_columns };
+        my $fvals = { $f_obj->get_columns };
+
+        # The very low level resolve_relationship_condition() deliberately contains
+        # extra logic to ensure that it isn't passed garbage. Unfortunately we can
+        # get into a situation where an object *has* extra columns on it, which
+        # the interface of ->get_columns is obligated to return. In order not to
+        # compromise the sanity checks within r_r_c, simply do a cleanup pass here,
+        # and in 2 other spots within the codebase to keep things consistent
+        #
+        # FIXME - perhaps this should warn, but that's a battle for another day
+        #
+        +{ map {
+          exists $fvals->{$_}
+            ? ( $_ => $fvals->{$_} )
+            : ()
+        } $f_result_source->columns };
       }
     ),
 
diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 030f2924b..e66a74044 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -841,7 +841,8 @@ sub find {
           foreign_values => (
             (! defined blessed $foreign_val) ? $foreign_val : do {
 
-              my $f_result_class = $rsrc->related_source($key)->result_class;
+              my $f_rsrc = $rsrc->related_source($key);
+              my $f_result_class = $f_rsrc->result_class;
 
               unless( $foreign_val->isa($f_result_class) ) {
 
@@ -859,7 +860,22 @@ sub find {
                 );
               }
 
-              +{ $foreign_val->get_columns };
+              my $fvals = { $foreign_val->get_columns };
+
+              # The very low level resolve_relationship_condition() deliberately contains
+              # extra logic to ensure that it isn't passed garbage. Unfortunately we can
+              # get into a situation where an object *has* extra columns on it, which
+              # the interface of ->get_columns is obligated to return. In order not to
+              # compromise the sanity checks within r_r_c, simply do a cleanup pass here,
+              # and in 2 other spots within the codebase to keep things consistent
+              #
+              # FIXME - perhaps this should warn, but that's a battle for another day
+              #
+              +{ map {
+                exists $fvals->{$_}
+                  ? ( $_ => $fvals->{$_} )
+                  : ()
+              } $f_rsrc->columns };
             }
           ),
 
diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm
index ddef5449c..2af12f6f0 100644
--- a/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@ -2218,7 +2218,22 @@ sub _resolve_condition :DBIC_method_is_indirect_sugar {
       }
       # more compat
       elsif( $_ == 0 and $res_args[0]->isa( $__expected_result_class_isa ) ) {
-        $res_args[0] = { $res_args[0]->get_columns };
+        my $fvals = { $res_args[0]->get_columns };
+
+        # The very low level resolve_relationship_condition() deliberately contains
+        # extra logic to ensure that it isn't passed garbage. Unfortunately we can
+        # get into a situation where an object *has* extra columns on it, which
+        # the interface of ->get_columns is obligated to return. In order not to
+        # compromise the sanity checks within r_r_c, simply do a cleanup pass here,
+        # and in 2 other spots within the codebase to keep things consistent
+        #
+        # FIXME - perhaps this should warn, but that's a battle for another day
+        #
+        $res_args[0] = { map {
+          exists $fvals->{$_}
+            ? ( $_ => $fvals->{$_} )
+            : ()
+        } $res_args[0]->result_source->columns };
       }
     }
     else {
diff --git a/t/cdbi/06-hasa.t b/t/cdbi/06-hasa.t
index abad17023..6d47c1232 100644
--- a/t/cdbi/06-hasa.t
+++ b/t/cdbi/06-hasa.t
@@ -118,7 +118,7 @@ sub fail_with_bad_object {
         NumExplodingSheep => 23
       }
     );
-  } qr/is not a column on related source 'Director'/;
+  } qr/isn't a Director/;
 }
 
 package Foo;
diff --git a/t/cdbi/18-has_a.t b/t/cdbi/18-has_a.t
index 6304b2c93..a7b069c06 100644
--- a/t/cdbi/18-has_a.t
+++ b/t/cdbi/18-has_a.t
@@ -110,7 +110,7 @@ is(
         Rating            => 'R',
         NumExplodingSheep => 23
       });
-  } qr/is not a column on related source 'Director'/, "Can't have film as codirector";
+  } qr/isn't a Director/, "Can't have film as codirector";
   is $fail, undef, "We didn't get anything";
 
   my $tastes_bad = YA::Film->create({