Fix updateManager corrupting vault problem

Adds lots of check before we proceed