diff --git a/lib/travis/api/v3/queries/crons.rb b/lib/travis/api/v3/queries/crons.rb
index 0105442e..d5799d58 100644
--- a/lib/travis/api/v3/queries/crons.rb
+++ b/lib/travis/api/v3/queries/crons.rb
@@ -9,6 +9,8 @@ module Travis::API::V3
       Models::Cron.all.select do |cron|
         start(cron) if cron.next_enqueuing <= Time.now
       end
+      rescue => e
+        Raven.capture_exception(e)
     end
 
     def start(cron)
@@ -30,8 +32,6 @@ module Travis::API::V3
       class_name, queue = Query.sidekiq_queue(:build_request)
       ::Sidekiq::Client.push('queue'.freeze => queue, 'class'.freeze => class_name, 'args'.freeze => [{type: 'cron'.freeze, payload: JSON.dump(payload), credentials: {}}])
       true
-    rescue => e
-      Raven.capture_exception(e)
     end
   end
 end
diff --git a/spec/v3/queries/cron_spec.rb b/spec/v3/queries/cron_spec.rb
index 488f0c4f..d6d16889 100644
--- a/spec/v3/queries/cron_spec.rb
+++ b/spec/v3/queries/cron_spec.rb
@@ -26,9 +26,7 @@ describe Travis::API::V3::Queries::Crons do
       cron = Travis::API::V3::Models::Cron.create(branch_id: existing_branch.id, interval: 'daily', disable_by_build: false)
       error = StandardError.new('Konstantin broke all the thingz!')
       Travis::API::V3::Models::Cron.any_instance.stubs(:branch).raises(error)
-      Raven.expects(:capture_exception).with do |event|
-        event.message == "#{error.class}: #{error.message}"
-      end
+      Raven.expects(:capture_exception).with(error)
       query.start_all
     end
   end