More resilience in the getter