Maybe if the can’t save bug is too hard to find, more than 1 incremental backup would help, maybe in a folder the patch resides in named backup which contains all the patches backups for that folder, then if it goes you can go back to where it still worked, and only loose a bit of work, instead of potentially all!