Issue #3479817: Uncaught PHP Exception Error: "Call to a member function getThirdPartySettings() on null"
Closes #3490949
merged