fix saga and improve patch error handling