PD-5781 & PD-0000 avoid oauth breaks when affiliations endpoint comes with issues.

PD-5781 & PD-0000 avoid oauth breaks when affiliations endpoint comes with issues. #2024