Fix possible error if key does not exist
Fix tokens have no role
Merge pull request #10 from luiges90/master

Bug fixes