die on error

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 2f4aa1f..0615253 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -186,9 +186,7 @@ sub import {
 
             $plugin->require;
 
-            if ($@) {
-                $caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
-            }
+            if ($@) { die qq/Couldn't load plugin "$plugin", "$@"/ }
             else {
                 push @plugins, $plugin;
                 no strict 'refs';

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index a7f2e7b..6764524 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -624,8 +624,7 @@ sub setup_components {
 
     if ( my $error = $@ ) {
         chomp $error;
-        $self->log->error(
-            qq/Couldn't initialize "Module::Pluggable::Fast", "$error"/);
+        die qq/Couldn't load components "$error"/;
     }
 
     $self->components( {} );