diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e18d30..c6e9d75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- Raise `ffmpeg` errors as early as possible, e.g. when the `ffmpeg` command is not found
+
 ## [0.13.0] - 2024-05-15
 
 ## Added
@@ -16,9 +20,8 @@ All notable changes to this project will be documented in this file.
   * Put `Parser` behind a trait, so that we can have multiple implementation in parallel
   * Use cargo workspaces
   * Better error handling using snafu
-- BREAKING: Build release binaries without support for VNC, as this ([#22])
+- BREAKING: Build release binaries without support for VNC, as this
   * Has a dependecy on a dynamically linked library on the host executing the binary
   * Needs a cross-compilation (which didn't work), as the macOS GitHub runners all run on arm and we try to build an x86 binary
 
 [#21]: https://github.com/sbernauer/breakwater/pull/21
-[#22]: https://github.com/sbernauer/breakwater/pull/22
diff --git a/breakwater/src/main.rs b/breakwater/src/main.rs
index 2071289..7f01fb4 100644
--- a/breakwater/src/main.rs
+++ b/breakwater/src/main.rs
@@ -142,7 +142,8 @@ async fn main() -> Result<(), Error> {
         tokio::spawn(async move {
             sink.run(ffmpeg_terminate_signal_rx)
                 .await
-                .context(FfmpegDumpThreadSnafu)?;
+                .context(FfmpegDumpThreadSnafu)
+                .unwrap();
             Ok::<(), Error>(())
         })
     });
diff --git a/breakwater/src/sinks/ffmpeg.rs b/breakwater/src/sinks/ffmpeg.rs
index b876c6e..26bf6df 100644
--- a/breakwater/src/sinks/ffmpeg.rs
+++ b/breakwater/src/sinks/ffmpeg.rs
@@ -15,7 +15,7 @@ use crate::cli_args::CliArgs;
 
 #[derive(Debug, Snafu)]
 pub enum Error {
-    #[snafu(display("Failed to start ffmpeg command {command:?}"))]
+    #[snafu(display("Failed to start ffmpeg command {command:?}. Is ffmpeg installed?"))]
     StartFfmpeg {
         source: std::io::Error,
         command: String,