Add mechanism for failing at errors