Failfast behaviour change