Add safety checks to updater. Maybe overkill, best to be safe.
Merge pull request #1145 from garvankeeley/updater-safety

Add safety checks to updater. Maybe overkill, best to be safe.