gistfile1.diff

diff --git a/lib/AnyEvent/IRC/Client.pm b/lib/AnyEvent/IRC/Client.pm
index 4992398..2b2cd98 100644
--- a/lib/AnyEvent/IRC/Client.pm
+++ b/lib/AnyEvent/IRC/Client.pm
@@ -452,7 +452,9 @@ All keys, except C<nick> are optional.
 sub connect {
    my ($self, $host, $port, $info) = @_;
 
-   if (defined $info) {
+   my $timeout = delete $info->{timeout};
+
+   if (defined $info and keys %$info) {
       $self->{register_cb_guard} = $self->reg_cb (
          ext_before_connect => sub {
             my ($self, $err) = @_;
@@ -468,7 +470,7 @@ sub connect {
       );
    }
 
-   $self->SUPER::connect ($host, $port, $info->{timeout});
+   $self->SUPER::connect ($host, $port, $timeout);
 }
 
 =item $cl->register ($nick, $user, $real, $server_pass)