Token error handling
Resloved merge conflict