Added defensive checks for the revert data
Rewrote some logic into their own function. Only validate our part if the override option is on