diff --git a/cmd/root.go b/cmd/root.go
index 0b132c5..da5e4f5 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -141,9 +141,9 @@ func loadConfig(path string) (Config, error) {
 		if os.IsNotExist(err) {
 			return c, errors.Err("config file not found")
 		}
-		return c, err
+		return c, errors.Err(err)
 	}
 
 	err = json.Unmarshal(raw, &c)
-	return c, err
+	return c, errors.Err(err)
 }
diff --git a/peer/server.go b/peer/server.go
index 03b3b81..e55faa3 100644
--- a/peer/server.go
+++ b/peer/server.go
@@ -159,7 +159,7 @@ func (s *Server) handleAvailabilityRequest(data []byte) ([]byte, error) {
 	var request availabilityRequest
 	err := json.Unmarshal(data, &request)
 	if err != nil {
-		return nil, err
+		return nil, errors.Err(err)
 	}
 
 	availableBlobs := []string{}
@@ -220,7 +220,7 @@ func (s *Server) handleCompositeRequest(data []byte) ([]byte, error) {
 	var request compositeRequest
 	err := json.Unmarshal(data, &request)
 	if err != nil {
-		return nil, err
+		return nil, errors.Err(err)
 	}
 
 	response := compositeResponse{
diff --git a/store/dbbacked.go b/store/dbbacked.go
index cb358eb..e5912d6 100644
--- a/store/dbbacked.go
+++ b/store/dbbacked.go
@@ -51,7 +51,7 @@ func (d *DBBackedStore) PutSD(hash string, blob stream.Blob) error {
 	var blobContents db.SdBlob
 	err := json.Unmarshal(blob, &blobContents)
 	if err != nil {
-		return err
+		return errors.Err(err)
 	}
 	if blobContents.StreamHash == "" {
 		return errors.Err("sd blob is missing stream hash")
diff --git a/wallet/network.go b/wallet/network.go
index 24f8b56..54186f6 100644
--- a/wallet/network.go
+++ b/wallet/network.go
@@ -173,8 +173,8 @@ func (n *Node) listen() {
 			}
 
 			if err != nil {
-				n.err(err)
 				r.err = errors.Err(err)
+				n.err(r.err)
 			} else if len(msg.Error.Message) > 0 {
 				r.err = errors.Base("%d: %s", msg.Error.Code, msg.Error.Message)
 			} else {
@@ -258,5 +258,5 @@ func (n *Node) request(method string, params []string, v interface{}) error {
 		return r.err
 	}
 
-	return json.Unmarshal(r.data, v)
+	return errors.Err(json.Unmarshal(r.data, v))
 }