Improved last rights on API error