--- a/media/audioipc/audioipc/src/connection.rs
+++ b/media/audioipc/audioipc/src/connection.rs
@@ -4,16 +4,17 @@ use bytes::{BufMut, BytesMut};
 use codec::{Decoder, encode};
 use errors::*;
 use mio::{Poll, PollOpt, Ready, Token};
 use mio::event::Evented;
 use mio::unix::EventedFd;
 use serde::de::DeserializeOwned;
 use serde::ser::Serialize;
 use std::collections::VecDeque;
+use std::error::Error;
 use std::fmt::Debug;
 use std::io::{self, Read};
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::os::unix::net;
 use std::os::unix::prelude::*;
 
 // Because of the trait implementation rules in Rust, this needs to be
 // a wrapper class to allow implementation of a trait from another
@@ -121,17 +122,17 @@ impl Connection {
                         self.recv_fd.push_back(
                             unsafe { AutoCloseFd::from_raw_fd(fd) }
                         );
                     }
                 },
                 Ok(Async::NotReady) => bail!("Socket should be blocking."),
                 // TODO: Handle dropped message.
                 // Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => panic!("wouldblock"),
-                _ => bail!("socket write"),
+                Err(e) => bail!("stream recv_buf_fd returned: {}", e.description()),
             }
         }
     }
 
     pub fn send<ST>(&mut self, msg: ST) -> Result<usize>
     where
         ST: Serialize + Debug,
     {

--- a/media/audioipc/audioipc/src/messages.rs
+++ b/media/audioipc/audioipc/src/messages.rs
@@ -238,12 +238,10 @@ pub enum ClientMessage {
     StreamLatency(u32),
     StreamVolumeSet,
     StreamPanningSet,
     StreamCurrentDevice(Device),
 
     StreamDataCallback(isize, usize),
     StreamStateCallback(ffi::cubeb_state),
 
-    ContextError(ffi::cubeb_error_code),
-    StreamError, /*(Error)*/
-    ClientError /*(Error)*/
+    Error(ffi::cubeb_error_code)
 }

--- a/media/audioipc/client/src/send_recv.rs
+++ b/media/audioipc/client/src/send_recv.rs
@@ -27,26 +27,40 @@ macro_rules! send_recv {
     (__send $conn:expr, $smsg:ident, $($a:expr),*) => ({
         let r = $conn.send(ServerMessage::$smsg($($a),*));
         if r.is_err() {
             debug!("send error - got={:?}", r);
             return Err(ErrorCode::Error.into());
         }
     });
     (__recv $conn:expr, $rmsg:ident) => ({
-        let r = $conn.receive().unwrap();
-        if let ClientMessage::$rmsg = r {
-            Ok(())
-        } else {
-            debug!("receive error - got={:?}", r);
-            Err(ErrorCode::Error.into())
+        match $conn.receive() {
+            Ok(ClientMessage::$rmsg) => Ok(()),
+            // Macro can see ErrorCode but not Error? I don't understand.
+            // ::cubeb_core::Error is fragile but this isn't general purpose code.
+            Ok(ClientMessage::Error(e)) => Err(unsafe { ::cubeb_core::Error::from_raw(e) }),
+            Ok(m) => {
+                debug!("receive unexpected message - got={:?}", m);
+                Err(ErrorCode::Error.into())
+            },
+            Err(e) => {
+                debug!("receive error - got={:?}", e);
+                Err(ErrorCode::Error.into())
+            },
         }
     });
     (__recv $conn:expr, $rmsg:ident __result) => ({
-        let r = $conn.receive().unwrap();
-        if let ClientMessage::$rmsg(v) = r {
-            Ok(v)
-        } else {
-            debug!("receive error - got={:?}", r);
-            Err(ErrorCode::Error.into())
+        match $conn.receive() {
+            Ok(ClientMessage::$rmsg(v)) => Ok(v),
+            // Macro can see ErrorCode but not Error? I don't understand.
+            // ::cubeb_core::Error is fragile but this isn't general purpose code.
+            Ok(ClientMessage::Error(e)) => Err(unsafe { ::cubeb_core::Error::from_raw(e) }),
+            Ok(m) => {
+                debug!("receive unexpected message - got={:?}", m);
+                Err(ErrorCode::Error.into())
+            },
+            Err(e) => {
+                debug!("receive error - got={:?}", e);
+                Err(ErrorCode::Error.into())
+            },
         }
     })
 }

--- a/media/audioipc/server/src/lib.rs
+++ b/media/audioipc/server/src/lib.rs
@@ -758,17 +758,17 @@ pub fn run(running: Arc<AtomicBool>) -> 
             return r;
         }
     }
 
     //poll.deregister(&server.socket).unwrap();
 }
 
 fn error(error: cubeb::Error) -> ClientMessage {
-    ClientMessage::ContextError(error.raw_code())
+    ClientMessage::Error(error.raw_code())
 }
 
 struct ServerWrapper {
     thread_handle: std::thread::JoinHandle<()>,
     sender_ctl: channel::SenderCtl,
     path: std::path::PathBuf,
 }