X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=cb3e86d14d2c9d852ce4987070df2ed1c751265b;hp=90d36108b8a6bd4b93e99e607799233904b6c36f;hb=81e75875ca7cea9004783a0c142040081da630d8;hpb=2bf9a2ec89467d3f2ff89370cb82336ad07d721a

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 90d3610..cb3e86d 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -889,6 +889,7 @@ sub uri_for {
                          : [] );
         $path = $c->dispatcher->uri_for_action($path, $captures);
         return undef unless defined($path);
+        $path = '/' if $path eq '';
     }
 
     # massage namespace, empty if absolute path
@@ -1147,7 +1148,7 @@ sub execute {
     my $last = pop( @{ $c->stack } );
 
     if ( my $error = $@ ) {
-        if ( $error eq $DETACH ) { die $DETACH if $c->depth > 1 }
+        if ( !ref($error) and $error eq $DETACH ) { die $DETACH if $c->depth > 1 }
         else {
             unless ( ref $error ) {
                 no warnings 'uninitialized';