Fix for HttpClientManager being null