SUP-1627 handle API errors as errors