diff --git a/endpoint/endpoint.go b/endpoint/endpoint.go
index a928d80..d64ca88 100644
--- a/endpoint/endpoint.go
+++ b/endpoint/endpoint.go
@@ -349,7 +349,7 @@ func (s *Receiver) Receive(ctx context.Context, req *pdu.ReceiveReq, receive zfs
 	getLogger(ctx).WithField("visitErr", visitErr).Debug("complete tree-walk")
 
 	if visitErr != nil {
-		return nil, err
+		return nil, visitErr
 	}
 
 	var clearPlaceholderProperty bool