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

Small improvement :smile: