Update how to manage SaupFault and remove a useless catch