X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FDBICTest%2FBaseSchema.pm;h=aaaf955cafa15695d0e6cd75a5dfac19be6e0aad;hb=4ee643f5a0b025634b15077d4d82028a6ee8e21b;hp=726ce10f26f6627695fadbed625f969a5a6e0f8f;hpb=44c1a75dd318ee6d943c91939c1b595ecc1d625b;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/lib/DBICTest/BaseSchema.pm b/t/lib/DBICTest/BaseSchema.pm
index 726ce10..aaaf955 100644
--- a/t/lib/DBICTest/BaseSchema.pm
+++ b/t/lib/DBICTest/BaseSchema.pm
@@ -96,7 +96,7 @@ if( $ENV{DBICTEST_ASSERT_NO_SPURIOUS_EXCEPTION_ACTION} ) {
       (
         caller(0) eq 'main'
           and
-        (caller(1))[0] !~ $interesting_ns_rx
+        ( (caller(1))[0] || '' ) !~ $interesting_ns_rx
       )
     );
 
@@ -262,7 +262,7 @@ sub connection {
       # we need to work with a forced fresh clone so that we do not upset any state
       # of the main $schema (some tests examine it quite closely)
       local $SIG{__WARN__} = sub {};
-      local $SIG{__DIE__};
+      local $SIG{__DIE__} if $SIG{__DIE__};
       local $@;
 
       # this will either give us an undef $locktype or will determine things