diff --git a/src/client.rs b/src/client.rs
index 77ca012..60f29a3 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -4,11 +4,11 @@ use mio;
 
 use config;
 use control::{ControlRequest, ControlResponse};
-use proto::{Request, Response};
+use proto::{Response, Request};
 use proto::server::*;
 
 pub enum IncomingMessage {
-    ServerResponse(ServerResponse),
+    ProtoResponse(Response),
     ControlRequest(ControlRequest),
 }
 
@@ -56,12 +56,15 @@ impl Client {
 
         loop {
             match self.rx.recv() {
-                Ok(IncomingMessage::ServerResponse(server_response)) => {
+                Ok(IncomingMessage::ProtoResponse(
+                        Response::ServerResponse(server_response))) => {
                     self.handle_server_response(server_response);
                 },
+
                 Ok(IncomingMessage::ControlRequest(control_request)) => {
                     warn!("Unhandled control request: {:?}", control_request);
                 },
+
                 Err(e) => {
                     error!("Error receiving response: {}", e);
                 },
diff --git a/src/handler.rs b/src/handler.rs
index 31d7e9b..ac213df 100644
--- a/src/handler.rs
+++ b/src/handler.rs
@@ -6,7 +6,7 @@ use mio::{EventLoop, EventSet, Handler, PollOpt, Token};
 use mio::tcp::TcpStream;
 
 use client::IncomingMessage;
-use proto::{Packet, PacketStream, Request};
+use proto::{Packet, PacketStream, Request, Response};
 use proto::server::*;
 
 struct TokenCounter {
@@ -95,7 +95,8 @@ impl ConnectionHandler {
         };
 
         let server_response = try!(ServerResponse::from_packet(packet));
-        let message = IncomingMessage::ServerResponse(server_response);
+        let message = IncomingMessage::ProtoResponse(
+            Response::ServerResponse(server_response));
         match self.client_tx.send(message) {
             Ok(()) => Ok(true),
             Err(e) => Err(io::Error::new(