Make snapshot service more robust