Patches/issue #586 (#631)
Patches/issue #586 (#631)

* Fixed #586 - Return an error if a user hasn't been returned by the token, rather than an exception being thrown.
enlim/core,enlim/core,enlim/core,atoff/core,atoff/core