X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=eb3c6cb4ab85b21fc77ec1c49453be43baf81634;hp=3b66cd5f612f0d8e88649031954ed7f2fb95c99e;hb=676438a11cbf6bd49102369824c9d87f70964fd3;hpb=dc28afe80b27f0eb81eef66e6ba554a7c1fb6e41

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 3b66cd5..eb3c6cb 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -2,6 +2,7 @@ package Object::Remote::Connection;
 
 use Object::Remote::Future;
 use Object::Remote::Null;
+use Object::Remote::Handle;
 use Object::Remote;
 use IO::Handle;
 use Module::Runtime qw(use_module);
@@ -56,7 +57,7 @@ sub _build__json {
       return bless({}, 'Object::Remote::Null') if $id eq 'NULL';
       (
         $remotes->{$id}
-        or Object::Remote->new(connection => $self, id => $id)
+        or Object::Remote::Handle->new(connection => $self, id => $id)
       )->proxy;
     }
   );
@@ -204,6 +205,7 @@ sub _invoke {
   if ($method =~ /^start::/) {
     my $f = $local->$method(@args);
     $f->on_done(sub { undef($f); $future->done(@_) });
+    return unless $f;
     $f->on_fail(sub { undef($f); $future->fail(@_) });
     return;
   }