More checks for auto snapshotting (to avoid race conditions)