Better error resilience