Add "killswitch" for DVV

Harden code a little