Fixed NPE when one type of token is not present