Avoid missing class error for fetch_thirdparty method
Merge pull request #1973 from jfefe/patch-6

 Avoid missing class error for fetch_thirdparty method