diff --git a/tarpc/src/protocol.rs b/tarpc/src/protocol.rs
index f0d22a1..1414570 100644
--- a/tarpc/src/protocol.rs
+++ b/tarpc/src/protocol.rs
@@ -457,8 +457,9 @@ impl<Request, Reply> Drop for Client<Request, Reply>
                             .stream
                             .shutdown(::std::net::Shutdown::Both) {
             warn!("Client: couldn't shutdown reader thread: {:?}", e);
+        } else {
+            self.reader_guard.take().unwrap().join().unwrap();
         }
-        self.reader_guard.take().unwrap().join().unwrap();
     }
 }