Fix possible error if key does not exist
Fix tokens have no role