diff --git a/src/decoder/image.rs b/src/decoder/image.rs
index fb8fcb4..eb513fc 100644
--- a/src/decoder/image.rs
+++ b/src/decoder/image.rs
@@ -660,7 +660,10 @@ impl Image {
             #[cfg(feature = "zstd")]
             CompressionMethod::ZSTD => Box::new(zstd::Decoder::new(reader)?),
             #[cfg(all(not(feature = "zstd"), feature = "safe-rust-zstd"))]
-            CompressionMethod::ZSTD => Box::new(ruzstd::decoding::StreamingDecoder::new(reader).unwrap()), // TODO: Error handling
+            CompressionMethod::ZSTD => Box::new(
+                ruzstd::decoding::StreamingDecoder::new(reader)
+                    .map_err(|e| std::io::Error::other(e))?,
+            ),
             CompressionMethod::PackBits => Box::new(PackBitsReader::new(reader, compressed_length)),
             #[cfg(feature = "deflate")]
             CompressionMethod::Deflate | CompressionMethod::OldDeflate => {