Merge pull request #16465 from albionbrown/#1565-API-Exception