More careful checking for auto snapshot