diff --git a/crates/tabby-scheduler/src/lib.rs b/crates/tabby-scheduler/src/lib.rs
index dd15cdc8b76c..e4b55d38a91f 100644
--- a/crates/tabby-scheduler/src/lib.rs
+++ b/crates/tabby-scheduler/src/lib.rs
@@ -15,8 +15,8 @@ use tracing::{error, info, warn};
 pub async fn scheduler<T: RepositoryAccess + 'static>(now: bool, access: T) -> Result<()> {
     if now {
         let repositories = access.list_repositories().await?;
-        job_sync(&repositories);
-        job_index(&repositories);
+        job_sync(&repositories)?;
+        job_index(&repositories)?;
     } else {
         let access = Arc::new(access);
         let scheduler = JobScheduler::new().await?;
@@ -37,8 +37,12 @@ pub async fn scheduler<T: RepositoryAccess + 'static>(now: bool, access: T) -> R
                         .list_repositories()
                         .await
                         .expect("Must be able to retrieve repositories for sync");
-                    job_sync(&repositories);
-                    job_index(&repositories);
+                    if let Err(e) = job_sync(&repositories) {
+                        error!("{e}");
+                    }
+                    if let Err(e) = job_index(&repositories) {
+                        error!("{e}")
+                    }
                 })
             })?)
             .await?;
@@ -53,25 +57,26 @@ pub async fn scheduler<T: RepositoryAccess + 'static>(now: bool, access: T) -> R
     Ok(())
 }
 
-fn job_index(repositories: &[RepositoryConfig]) {
+fn job_index(repositories: &[RepositoryConfig]) -> Result<()> {
     println!("Indexing repositories...");
     let ret = index::index_repositories(repositories);
     if let Err(err) = ret {
-        error!("Failed to index repositories, err: '{}'", err);
+        return Err(err.context("Failed to index repositories"));
     }
+    Ok(())
 }
 
-fn job_sync(repositories: &[RepositoryConfig]) {
+fn job_sync(repositories: &[RepositoryConfig]) -> Result<()> {
     println!("Syncing {} repositories...", repositories.len());
     let ret = repository::sync_repositories(repositories);
     if let Err(err) = ret {
-        error!("Failed to sync repositories, err: '{}'", err);
-        return;
+        return Err(err.context("Failed to sync repositories"));
     }
 
     println!("Building dataset...");
     let ret = dataset::create_dataset(repositories);
     if let Err(err) = ret {
-        error!("Failed to build dataset, err: '{}'", err);
+        return Err(err.context("Failed to build dataset"));
     }
+    Ok(())
 }