diff --git a/src/core/index.rs b/src/core/index.rs
index 191fe986b..01a0abe54 100644
--- a/src/core/index.rs
+++ b/src/core/index.rs
@@ -1,5 +1,5 @@
 use Result;
-use error::*;
+use error::{ErrorKind, ResultExt};
 use serde_json;
 use schema::Schema;
 use std::sync::Arc;
diff --git a/src/directory/managed_directory.rs b/src/directory/managed_directory.rs
index 04d1fd328..29cbef114 100644
--- a/src/directory/managed_directory.rs
+++ b/src/directory/managed_directory.rs
@@ -12,7 +12,7 @@ use std::io::Write;
 use core::MANAGED_FILEPATH;
 use std::collections::HashMap;
 use std::fmt;
-use error::*;
+use error::{Result, ErrorKind, ResultExt};
 
 /// Wrapper of directories that keeps track of files created by Tantivy.
 ///
diff --git a/src/indexer/index_writer.rs b/src/indexer/index_writer.rs
index 995f2f435..aa577f317 100644
--- a/src/indexer/index_writer.rs
+++ b/src/indexer/index_writer.rs
@@ -9,7 +9,7 @@ use core::SegmentReader;
 use indexer::stamper::Stamper;
 use datastruct::stacker::Heap;
 use directory::FileProtection;
-use error::*;
+use error::{Error, ErrorKind, Result, ResultExt};
 use Directory;
 use fastfield::write_delete_bitset;
 use indexer::delete_queue::{DeleteCursor, DeleteQueue};
diff --git a/src/indexer/merger.rs b/src/indexer/merger.rs
index ab82debc9..b9a536c8d 100644
--- a/src/indexer/merger.rs
+++ b/src/indexer/merger.rs
@@ -1,4 +1,4 @@
-use error::*;
+use error::{ErrorKind, Result};
 use core::SegmentReader;
 use core::Segment;
 use DocId;
diff --git a/src/indexer/segment_updater.rs b/src/indexer/segment_updater.rs
index d443d7ad1..cc04a77f7 100644
--- a/src/indexer/segment_updater.rs
+++ b/src/indexer/segment_updater.rs
@@ -7,7 +7,7 @@ use core::SegmentMeta;
 use core::SerializableSegment;
 use directory::Directory;
 use indexer::stamper::Stamper;
-use error::*;
+use error::{Error, ErrorKind, Result};
 use futures_cpupool::CpuPool;
 use futures::Future;
 use futures::Canceled;