X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=9a886e635c6cc68b4386b5ecba6518de0d53250d;hb=cf1fb734a3ab53b536aac54bcb3d382c845b46a8;hp=a7519840460a3787617e17d51bf0ccaa4ace6b96;hpb=79f5d5718d885ee1c3f288159a31562f9cf5b02f;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index a751984..9a886e6 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1512,10 +1512,10 @@ sub execute {
 
     if ( my $error = $@ ) {
         if ( blessed($error) and $error->isa('Catalyst::Exception::Detach') ) {
-            die $DETACH if($c->depth > 1);
+            $error->rethrow if $c->depth > 1;
         }
         elsif ( blessed($error) and $error->isa('Catalyst::Exception::Go') ) {
-            die $GO if($c->depth > 0);
+            $error->rethrow if $c->depth > 0;
         }
         else {
             unless ( ref $error ) {
@@ -2511,7 +2511,7 @@ the plugin name does not begin with C<Catalyst::Plugin::>.
 
         $class->_plugins( {} ) unless $class->_plugins;
         $plugins ||= [];
-                
+
         my @plugins = Catalyst::Utils::resolve_namespace($class . '::Plugin', 'Catalyst::Plugin', @$plugins);
 
         for my $plugin ( reverse @plugins ) {