X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FMethod%2FDelegation.pm;h=88ea1fa14e0982fc410121902ba8b96d4d9490dd;hb=2cc6f9825ee943b379068b9e9d4938bbc84e0308;hp=74bdfa8a5bdbeed87b3f0b65515a4637f6df29d1;hpb=dbe21639d532a07229d0beeffafafba66a7e26f5;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Method/Delegation.pm b/lib/Moose/Meta/Method/Delegation.pm
index 74bdfa8..88ea1fa 100644
--- a/lib/Moose/Meta/Method/Delegation.pm
+++ b/lib/Moose/Meta/Method/Delegation.pm
@@ -7,7 +7,7 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed', 'weaken';
 
-our $VERSION   = '0.79';
+our $VERSION   = '0.86';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -70,7 +70,7 @@ sub _initialize_body {
     # NOTE: we used to do a goto here, but the goto didn't handle
     # failure correctly (it just returned nothing), so I took that
     # out. However, the more I thought about it, the less I liked it
-    # doing the goto, and I prefered the act of delegation being
+    # doing the goto, and I preferred the act of delegation being
     # actually represented in the stack trace.  - SL
     # not inlining this, since it won't really speed things up at
     # all... the only thing that would end up different would be
@@ -79,15 +79,23 @@ sub _initialize_body {
     $self->{body} = sub {
         my $instance = shift;
         my $proxy    = $instance->$accessor();
-        ( defined $proxy )
-            || $self->throw_error(
-            "Cannot delegate $handle_name to $method_to_call because "
-                . "the value of "
-                . $self->associated_attribute->name
-                . " is not defined",
-            method_name => $method_to_call,
-            object      => $instance
+
+        my $error
+            = !defined $proxy                 ? ' is not defined'
+            : ref($proxy) && !blessed($proxy) ? qq{ is not an object (got '$proxy')}
+            : undef;
+
+        if ($error) {
+            $self->throw_error(
+                "Cannot delegate $handle_name to $method_to_call because "
+                    . "the value of "
+                    . $self->associated_attribute->name
+                    . $error,
+                method_name => $method_to_call,
+                object      => $instance
             );
+        }
+
         $proxy->$method_to_call(@_);
     };
 }