diff --git a/app/models/repository.rb b/app/models/repository.rb
index 69d502c8..01aae6f4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -141,7 +141,12 @@ def score_commits(round = nil)
       if commit.message =~ PULL_REQ_MERGE_REGX
         commit.set(auto_score: 0)
       else
-        commit.set(auto_score: engine.calculate_score(commit))
+        begin
+          Sidekiq.logger.info "Scoring for commit: #{commit.id}, Round: #{round.from_date}"
+          commit.set(auto_score: engine.calculate_score(commit))
+        rescue StandardError => e
+          Sidekiq.logger.info "Commit: #{commit.id}, Error: #{e}"
+        end
       end
     end