Prevent KeyError in streamer matching
Split token module out from api
Don't mask Store errors
Propagate Store errors better