diff --git a/src/result.rs b/src/result.rs
index bde488ac..2be52c74 100644
--- a/src/result.rs
+++ b/src/result.rs
@@ -31,6 +31,14 @@ impl error::FromError<io::IoError> for ZipError
     }
 }
 
+impl<T> error::FromError<(T, io::IoError)> for ZipError
+{
+    fn from_error((_, err): (T, io::IoError)) -> ZipError
+    {
+        error::FromError::from_error(err)
+    }
+}
+
 impl error::Error for ZipError
 {
     fn description(&self) -> &str
diff --git a/src/writer.rs b/src/writer.rs
index 18535f26..2e05ab8a 100644
--- a/src/writer.rs
+++ b/src/writer.rs
@@ -223,7 +223,7 @@ impl<W: Writer+Seek> GenericZipWriter<W>
         {
             GenericZipWriter::Storer(w) => w,
             GenericZipWriter::Deflater(w) => try!(w.finish()),
-            GenericZipWriter::Bzip2(w) => try!(w.unwrap()),
+            GenericZipWriter::Bzip2(w) => try!(w.into_inner()),
             GenericZipWriter::Closed => try!(Err(io::standard_error(io::Closed))),
         };