Added more protection from bad future