Add FAILFAST support