better error-resilience