Renamed function
Better error reporting
Updated client mode token request
Merge remote-tracking branch 'origin/update-association-endpoint' into update-association-endpoint
Refactored