quick check on service layer of a token is present; added unit test as w...

Small improvement :smile: 

Should be merged to both: `1.0.x` and `master` branch