lib/airbrake.rb in airbrake-4.0.0 vs lib/airbrake.rb in airbrake-4.1.0

@@ -24,10 +24,15 @@
 require 'airbrake/backtrace'
 require 'airbrake/rack'
 require 'airbrake/sinatra'
 require 'airbrake/user_informer'
 
+begin
+  require 'airbrake/sidekiq'
+rescue LoadError
+end
+
 require 'airbrake/railtie' if defined?(Rails::Railtie)
 
 module Airbrake
   API_VERSION = "2.4"
   LOG_PREFIX = "** [Airbrake] "
@@ -175,11 +180,9 @@
     def unwrap_exception(exception)
       if exception.respond_to?(:original_exception)
         exception.original_exception
       elsif exception.respond_to?(:continued_exception)
         exception.continued_exception
-      else
-        exception
-      end
+      end || exception
     end
   end
 end