Add robustess against network drops