Patches to v1.6.1

* Allow a check to see if the token can be added before adding it.