Follow-up to #538

[rzadp]

Followup to comments in https://github.com/dxos/teamwork/pull/538 posted after merge.

• [ ] Destructuring, error throwing
• [ ] Use generator