Factor integrity checks out into separate methods
Factor integrity checks out into separate methods

(cherry picked from commit 0557128e3935d10e1ff807337c92590b13c4f5a2)

rlee287/pyautoupdate,rlee287/pyautoupdate