Merge pull request #15043 from prondubuisi/fix-civi-api3-exception