1 files changed, 2 insertions, 3 deletions
diff --git a/Bugzilla/Sentry.pm b/Bugzilla/Sentry.pm
index 8020ef56f..0d7a9c980 100644
--- a/Bugzilla/Sentry.pm
+++ b/Bugzilla/Sentry.pm
@@ -358,9 +358,8 @@ sub _sentry_die_handler {
 }
 
 sub install_sentry_handler {
-    require CGI::Carp;
-    CGI::Carp::set_die_handler(\&_sentry_die_handler);
-    $main::SIG{__WARN__} = sub {
+    $SIG{__DIE__}  = \&sentry_die_handler;
+    $SIG{__WARN__} = sub {
         return if _in_eval();
         sentry_handle_error('warning', shift);
     };