diff --git a/src/bin/ptth_relay.rs b/src/bin/ptth_relay.rs
index 9c6912b..77bbb56 100644
--- a/src/bin/ptth_relay.rs
+++ b/src/bin/ptth_relay.rs
@@ -25,8 +25,14 @@ async fn main () -> Result <(), Box <dyn Error>> {
 	
 	info! ("ptth_relay Git version: {:?}", ptth::git_version::GIT_VERSION);
 	
-	relay::run_relay (
-		Arc::new (RelayState::from (&config_file)),
-		ptth::graceful_shutdown::init ()
-	).await
+	let (shutdown_rx, forced_shutdown) = ptth::graceful_shutdown::init_with_force ();
+	
+	forced_shutdown.wrap_server (
+		relay::run_relay (
+			Arc::new (RelayState::from (&config_file)),
+			shutdown_rx
+		)
+	).await??;
+	
+	Ok (())
 }
diff --git a/src/relay/mod.rs b/src/relay/mod.rs
index add443b..10c642d 100644
--- a/src/relay/mod.rs
+++ b/src/relay/mod.rs
@@ -586,7 +586,6 @@ pub async fn run_relay (
 	
 	server.with_graceful_shutdown (async {
 		shutdown_oneshot.await.ok ();
-		info! ("Received graceful shutdown");
 		
 		state.shutdown_watch_tx.broadcast (true).unwrap ();
 		
@@ -612,10 +611,9 @@ pub async fn run_relay (
 			}
 		}
 		
-		info! ("Performed all cleanup");
+		debug! ("Performed all cleanup");
 	}).await?;
 	
-	info! ("Exiting");
 	Ok (())
 }