diff --git a/Cargo.toml b/Cargo.toml
index 42d5087e..d131925e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brotli"
-version = "3.2.0"
+version = "3.2.1"
 authors = ["Daniel Reiter Horn <danielrh@dropbox.com>", "The Brotli Authors"]
 description = "A brotli compressor and decompressor that with an interface avoiding the rust stdlib. This makes it suitable for embedded devices and kernels. It is designed with a pluggable allocator so that the standard lib's allocator may be employed. The default build also includes a stdlib allocator and stream interface. Disable this with --features=no-stdlib. All included code is safe."
 license = "BSD-3-Clause/MIT"
diff --git a/src/enc/writer.rs b/src/enc/writer.rs
index 1d02d77f..337c1150 100755
--- a/src/enc/writer.rs
+++ b/src/enc/writer.rs
@@ -213,6 +213,10 @@ CompressorWriterCustomIo<ErrType, W, BufferType, Alloc>
       self.output.as_ref().unwrap()
     }
     pub fn into_inner(mut self) -> W {
+      match self.flush_or_close(BrotliEncoderOperation::BROTLI_OPERATION_FINISH) {
+        Ok(_) => {},
+        Err(_) => {},
+      }
       core::mem::replace(&mut self.output, None).unwrap()
     }
 }
@@ -223,9 +227,11 @@ impl<ErrType,
      Alloc: BrotliAlloc> Drop for
 CompressorWriterCustomIo<ErrType, W, BufferType, Alloc> {
     fn drop(&mut self) {
-        match self.flush_or_close(BrotliEncoderOperation::BROTLI_OPERATION_FINISH) {
-              Ok(_) => {},
+        if self.output.is_some() {
+            match self.flush_or_close(BrotliEncoderOperation::BROTLI_OPERATION_FINISH) {
+                Ok(_) => {},
               Err(_) => {},
+            }
         }
         BrotliEncoderDestroyInstance(&mut self.state);
     }