X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=310553b0e2b844d774eefd49f76afee8719d72b8;hp=c131008a189c9e9cd36ec3144e1a828fb265e64c;hb=d7eb055c8594ef25e6de4d351f92403da6267664;hpb=e5210a95f78613a598abbfc7d29d92605d5bbad0

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index c131008..310553b 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -76,7 +76,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.80003';
+our $VERSION = '5.80004';
 
 {
     my $dev_version = $VERSION =~ /_\d{2}$/;
@@ -1101,6 +1101,7 @@ EOF
     # modifiers work correctly in MyApp (as you have to call setup _before_
     # applying modifiers).
     B::Hooks::EndOfScope::on_scope_end {
+        return if $@;
         my $meta = Class::MOP::get_metaclass_by_name($class);
         if ( $meta->is_immutable && ! { $meta->immutable_options }->{inline_constructor} ) {
             warn "You made your application class ($class) immutable, "
@@ -2711,6 +2712,8 @@ dkubb: Dan Kubb <dan.kubb-cpan@onautopilot.com>
 
 Drew Taylor
 
+dwc: Daniel Westermann-Clark <danieltwc@cpan.org>
+
 esskar: Sascha Kiefer
 
 fireartist: Carl Franks <cfranks@cpan.org>