Added breaking upon fatal-ish error