Make auto_archive check more defensive
Merge pull request #366 from jamesdabbs/master

Make auto_archive check more defensive