added exceptions for token