Removed Unnecessary Error Key in Token Generation on FirstTime Get Data
Error Key is still present in subsequent Token Generation
Merge branch 'master' into cluster