Client class renamed. Token exceptions in generic request are now trapped and handled