Minor fixes

- Fixing how `Promises` are handled within `client` & `data`
- Kudos to @unscriptable & @briancavalier for pointing out the mishandling