Minor changes, if token is present in handler return from there, only
when its not present look in store.