Added ApiException handle