diff --git a/backend/plugins/gitextractor/tasks/repo_cloner.go b/backend/plugins/gitextractor/tasks/repo_cloner.go
index c7284110525..d4efd278d9d 100644
--- a/backend/plugins/gitextractor/tasks/repo_cloner.go
+++ b/backend/plugins/gitextractor/tasks/repo_cloner.go
@@ -39,7 +39,8 @@ var CloneGitRepoMeta = plugin.SubTaskMeta{
 func CloneGitRepo(subTaskCtx plugin.SubTaskContext) errors.Error {
 	taskData, ok := subTaskCtx.GetData().(*parser.GitExtractorTaskData)
 	if !ok {
-		panic("git repo reference not found on context")
+		subTaskCtx.GetLogger().Error(nil, "git repo reference not found on context")
+		return errors.Default.New("git repo reference not found on context")
 	}
 	op := taskData.Options
 	storage := store.NewDatabase(subTaskCtx, op.RepoId)
diff --git a/backend/plugins/gitextractor/tasks/repo_collector.go b/backend/plugins/gitextractor/tasks/repo_collector.go
index 23fbe173455..42da505519f 100644
--- a/backend/plugins/gitextractor/tasks/repo_collector.go
+++ b/backend/plugins/gitextractor/tasks/repo_collector.go
@@ -84,10 +84,12 @@ func CollectGitDiffLines(subTaskCtx plugin.SubTaskContext) errors.Error {
 func getGitRepo(subTaskCtx plugin.SubTaskContext) parser.RepoCollector {
 	taskData, ok := subTaskCtx.GetData().(*parser.GitExtractorTaskData)
 	if !ok {
-		panic("git repo reference not found on context")
+		subTaskCtx.GetLogger().Error(nil, "git repo reference not found on context")
+		return nil
 	}
 	if taskData.GitRepo == nil {
-		panic("git repo is empty, please check subtask: clone repo")
+		subTaskCtx.GetLogger().Error(nil, "git repo is empty, skipping Collect Commits subtask")
+		return nil
 	}
 	return taskData.GitRepo
 }