Fixed null server provider issue