diff --git a/pkg/lisafs/channel.go b/pkg/lisafs/channel.go
index 2efe4b1a5..383b7ae04 100644
--- a/pkg/lisafs/channel.go
+++ b/pkg/lisafs/channel.go
@@ -74,7 +74,7 @@ func (ch *channel) SndRcvMessage(m MID, payloadLen uint32, wantFDs uint8) (MID,
 		// This channel is now unusable.
 		ch.dead = true
 		// Map the transport errors to EIO, but also log the real error.
-		log.Warningf("lisafs.sndRcvMessage: flipcall.Endpoint.SendRecv: %v", err)
+		log.Warningf("channel.SndRcvMessage: flipcall.Endpoint.SendRecv failed: %v", err)
 		return 0, 0, unix.EIO
 	}
 
diff --git a/pkg/lisafs/sock.go b/pkg/lisafs/sock.go
index 8f554f9ed..aa50e9a02 100644
--- a/pkg/lisafs/sock.go
+++ b/pkg/lisafs/sock.go
@@ -83,11 +83,18 @@ func (s *sockCommunicator) PayloadBuf(size uint32) []byte {
 
 // SndRcvMessage implements Communicator.SndRcvMessage.
 func (s *sockCommunicator) SndRcvMessage(m MID, payloadLen uint32, wantFDs uint8) (MID, uint32, error) {
+	// Map the transport errors to EIO, but also log the real error.
 	if err := s.sndPrepopulatedMsg(m, payloadLen, nil); err != nil {
-		return 0, 0, err
+		log.Warningf("socketCommunicator.SndRcvMessage: sndPrepopulatedMsg failed: %v", err)
+		return 0, 0, unix.EIO
 	}
 
-	return s.rcvMsg(wantFDs)
+	respM, respPayloadLen, err := s.rcvMsg(wantFDs)
+	if err != nil {
+		log.Warningf("socketCommunicator.SndRcvMessage: rcvMsg failed: %v", err)
+		return 0, 0, unix.EIO
+	}
+	return respM, respPayloadLen, nil
 }
 
 // String implements fmt.Stringer.String.