Finish non-existent API calls instead of timing out
Merge pull request #3529 from genial123/api-fix

Finish non-existent API calls instead of timing out