make server more resilient