diff --git a/lib/travis/api/v3/queries/crons.rb b/lib/travis/api/v3/queries/crons.rb
index aca22d2a..0105442e 100644
--- a/lib/travis/api/v3/queries/crons.rb
+++ b/lib/travis/api/v3/queries/crons.rb
@@ -31,7 +31,7 @@ module Travis::API::V3
       ::Sidekiq::Client.push('queue'.freeze => queue, 'class'.freeze => class_name, 'args'.freeze => [{type: 'cron'.freeze, payload: JSON.dump(payload), credentials: {}}])
       true
     rescue => e
-      puts e.message, e.backtrace
+      Raven.capture_exception(e)
     end
   end
 end
diff --git a/lib/travis/api/v3/router.rb b/lib/travis/api/v3/router.rb
index 49617cc7..4b5d7d4a 100644
--- a/lib/travis/api/v3/router.rb
+++ b/lib/travis/api/v3/router.rb
@@ -37,7 +37,6 @@ module Travis::API::V3
       metrics.success(status: response[0])
       response
     rescue Error => error
-      Raven.capture_exception(error)
       metrics.tick(:service)
 
       result   = Result.new(access_control, :error, error)
diff --git a/spec/v3/error_handling_spec.rb b/spec/v3/error_handling_spec.rb
index 33b3b762..62a3fbf7 100644
--- a/spec/v3/error_handling_spec.rb
+++ b/spec/v3/error_handling_spec.rb
@@ -9,25 +9,3 @@ describe Travis::API::V3::ServiceIndex, set_app: true do
     response.status.should == 405
   end
 end
-
-describe Travis::API::V3::Router, set_app: true do
-  include Rack::Test::Methods
-
-  class TestError < StandardError; end
-
-  before do
-    set_app Raven::Rack.new(app)
-    Travis.config.sentry.dsn = "test"
-    Travis::Api::App.setup_monitoring
-  end
-
-  it 'Sentry captures router errors' do
-    error = TestError.new('Konstantin broke all the thingz!')
-    Travis::API::V3::Models::Repository.any_instance.stubs(:service).raises(error)
-    Raven.expects(:send_event).with do |event|
-      event.message == "#{error.class}: #{error.message}"
-    end
-    expect { get "/v3/repo/1" }.to raise_error(TestError)
-    sleep 0.1
-  end
-end
diff --git a/spec/v3/queries/cron_spec.rb b/spec/v3/queries/cron_spec.rb
index 9a995d46..a96438d2 100644
--- a/spec/v3/queries/cron_spec.rb
+++ b/spec/v3/queries/cron_spec.rb
@@ -22,4 +22,20 @@ describe Travis::API::V3::Queries::Crons do
     end
   end
 
+  #TODO - mock any instance of cron branch (line 15) - cron branch re
+  # Travis::API::V3::Models::Cron.any_instance.stubs(:branch).raises(error)
+
+  # describe Travis::API::V3::Router, set_app: true do
+  #
+  #   it 'Sentry captures router errors' do
+  #     error = StandardError.new('Konstantin broke all the thingz!')
+  #     Travis::API::V3::Services::Repository::Find.any_instance.stubs(:run!).raises(error)
+  #     Raven.expects(:capture_exception).with do |event|
+  #       event.message == "#{error.class}: #{error.message}"
+  #     end
+  #     expect { get "/v3/repo/1" }.to raise_error(error)
+  #   end
+  # end
+
+
 end