Add expired filestop handling