diff --git a/src/indexer/segment_writer.rs b/src/indexer/segment_writer.rs
index ce6519393..8b180c62b 100644
--- a/src/indexer/segment_writer.rs
+++ b/src/indexer/segment_writer.rs
@@ -1,5 +1,6 @@
 use Result;
 use DocId;
+use std::io;
 use schema::Schema;
 use schema::Document;
 use schema::Term;
@@ -99,7 +100,7 @@ impl SegmentWriter {
 			  self.segment_serializer)
 	}
 
-    pub fn add_document(&mut self, doc: &Document, schema: &Schema) -> Result<()> {
+    pub fn add_document(&mut self, doc: &Document, schema: &Schema) -> io::Result<()> {
         let doc_id = self.max_doc;
         for (field, field_values) in doc.get_sorted_fields() {
 			// TODO pos collision if the field is redundant				
diff --git a/src/store/writer.rs b/src/store/writer.rs
index 281393c7b..9fbc0faba 100644
--- a/src/store/writer.rs
+++ b/src/store/writer.rs
@@ -83,9 +83,7 @@ impl StoreWriter {
     fn write_and_compress_block(&mut self,) -> io::Result<()> {
         self.intermediary_buffer.clear();
         {
-            let mut encoder = lz4::EncoderBuilder::new()
-                    .build(&mut self.intermediary_buffer)
-                    .unwrap();
+            let mut encoder = try!(lz4::EncoderBuilder::new().build(&mut self.intermediary_buffer));
             try!(encoder.write_all(&self.current_block));
             let (_, encoder_result) = encoder.finish();
             try!(encoder_result);