More aggressive error protection, and don’t decrypt when rebuild trigger...

...s