Changed the way guard failures closures are handled