Bug fix for NPE in AttributeToken

Closes #16