Moved into setStrategiesForClient, and removed potential NPE