Additional checks for null tokens
Merge pull request #108 from troupe/check_for_null_token

Additional checks for null tokens