[BC break] Improved handle of API response