3558458: add extra check on handleApiException

Closes #3558458

Merge request reports

Loading