diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
index 2e37999e..963997f8 100644
--- a/pbs-datastore/src/chunk_store.rs
+++ b/pbs-datastore/src/chunk_store.rs
@@ -280,13 +280,12 @@ impl ChunkStore {
         ProcessLocker::oldest_shared_lock(self.locker.clone())
     }
 
-    pub fn sweep_unused_chunks<F: Fn() -> Result<(), Error>>(
+    pub fn sweep_unused_chunks(
         &self,
         oldest_writer: i64,
         phase1_start_time: i64,
         status: &mut GarbageCollectionStatus,
         worker: &dyn WorkerTaskContext,
-        fail_on_shutdown: F,
     ) -> Result<(), Error> {
         use nix::sys::stat::fstatat;
         use nix::unistd::{unlinkat, UnlinkatFlags};
@@ -314,7 +313,7 @@ impl ChunkStore {
             }
 
             worker.check_abort()?;
-            fail_on_shutdown()?;
+            worker.fail_on_shutdown()?;
 
             let (dirfd, entry) = match entry {
                 Ok(entry) => (entry.parent_fd(), entry),
diff --git a/pbs-tools/src/task.rs b/pbs-tools/src/task.rs
index 1d096575..9e5d5b8f 100644
--- a/pbs-tools/src/task.rs
+++ b/pbs-tools/src/task.rs
@@ -16,6 +16,19 @@ pub trait WorkerTaskContext {
         Ok(())
     }
 
+    /// Test if there was a request to shutdown the server.
+    fn shutdown_requested(&self) -> bool;
+
+
+    /// This should fail with a reasonable error message if there was
+    /// a request to shutdown the server.
+    fn fail_on_shutdown(&self) -> Result<(), Error> {
+        if self.shutdown_requested() {
+            bail!("Server shutdown requested - aborting task");
+        }
+        Ok(())
+    }
+
     /// Create a log message for this task.
     fn log(&self, level: log::Level, message: &std::fmt::Arguments);
 }
@@ -30,6 +43,14 @@ impl<T: WorkerTaskContext + ?Sized> WorkerTaskContext for std::sync::Arc<T> {
         <T as WorkerTaskContext>::check_abort(&*self)
     }
 
+    fn shutdown_requested(&self) -> bool {
+        <T as WorkerTaskContext>::shutdown_requested(&*self)
+    }
+
+    fn fail_on_shutdown(&self) -> Result<(), Error> {
+        <T as WorkerTaskContext>::fail_on_shutdown(&*self)
+    }
+
     fn log(&self, level: log::Level, message: &std::fmt::Arguments) {
         <T as WorkerTaskContext>::log(&*self, level, message)
     }
diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs
index 7a2bb11c..b3b5d9e2 100644
--- a/proxmox-rest-server/src/worker_task.rs
+++ b/proxmox-rest-server/src/worker_task.rs
@@ -853,6 +853,14 @@ impl WorkerTaskContext for WorkerTask {
         self.abort_requested.load(Ordering::SeqCst)
     }
 
+    fn shutdown_requested(&self) -> bool {
+        crate::shutdown_requested()
+    }
+
+    fn fail_on_shutdown(&self) -> Result<(), Error> {
+        crate::fail_on_shutdown()
+    }
+
     fn log(&self, level: log::Level, message: &std::fmt::Arguments) {
         match level {
             log::Level::Error => self.log_warning(&message.to_string()),
diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs
index ec37286f..881c67ff 100644
--- a/src/backup/datastore.rs
+++ b/src/backup/datastore.rs
@@ -28,7 +28,6 @@ use pbs_tools::fs::{lock_dir_noblock, DirLockGuard};
 use pbs_tools::process_locker::ProcessLockSharedGuard;
 use pbs_tools::{task_log, task_warn, task::WorkerTaskContext};
 use pbs_config::{open_backup_lockfile, BackupLockGuard};
-use proxmox_rest_server::fail_on_shutdown;
 
 lazy_static! {
     static ref DATASTORE_MAP: Mutex<HashMap<String, Arc<DataStore>>> = Mutex::new(HashMap::new());
@@ -506,7 +505,7 @@ impl DataStore {
 
         for pos in 0..index.index_count() {
             worker.check_abort()?;
-            fail_on_shutdown()?;
+            worker.fail_on_shutdown()?;
             let digest = index.index_digest(pos).unwrap();
             if !self.chunk_store.cond_touch_chunk(digest, false)? {
                 task_warn!(
@@ -547,7 +546,7 @@ impl DataStore {
         for (i, img) in image_list.into_iter().enumerate() {
 
             worker.check_abort()?;
-            fail_on_shutdown()?;
+            worker.fail_on_shutdown()?;
 
             if let Some(backup_dir_path) = img.parent() {
                 let backup_dir_path = backup_dir_path.strip_prefix(self.base_path())?;
@@ -636,7 +635,6 @@ impl DataStore {
                 phase1_start_time,
                 &mut gc_status,
                 worker,
-                fail_on_shutdown,
             )?;
 
             task_log!(
diff --git a/src/backup/verify.rs b/src/backup/verify.rs
index 40185f8f..3e3500a3 100644
--- a/src/backup/verify.rs
+++ b/src/backup/verify.rs
@@ -172,7 +172,7 @@ fn verify_index_chunks(
     let check_abort = |pos: usize| -> Result<(), Error> {
         if pos & 1023 == 0 {
             verify_worker.worker.check_abort()?;
-            proxmox_rest_server::fail_on_shutdown()?;
+            verify_worker.worker.fail_on_shutdown()?;
         }
         Ok(())
     };
@@ -184,7 +184,7 @@ fn verify_index_chunks(
 
     for (pos, _) in chunk_list {
         verify_worker.worker.check_abort()?;
-        proxmox_rest_server::fail_on_shutdown()?;
+        verify_worker.worker.fail_on_shutdown()?;
 
         let info = index.chunk_info(pos).unwrap();
 
@@ -376,7 +376,7 @@ pub fn verify_backup_dir_with_lock(
         });
 
         verify_worker.worker.check_abort()?;
-        proxmox_rest_server::fail_on_shutdown()?;
+        verify_worker.worker.fail_on_shutdown()?;
 
         if let Err(err) = result {
             task_log!(
diff --git a/tests/worker-task-abort.rs b/tests/worker-task-abort.rs
index de7c25e3..8502aca9 100644
--- a/tests/worker-task-abort.rs
+++ b/tests/worker-task-abort.rs
@@ -9,7 +9,7 @@ use proxmox::try_block;
 use proxmox::tools::fs::CreateOptions;
 
 use pbs_api_types::{Authid, UPID};
-use pbs_tools::task_log;
+use pbs_tools::{task_log, task::WorkerTaskContext};
 
 use proxmox_rest_server::{CommandoSocket, WorkerTask};