Reverted to old regex for filename search; after several test runs, slight slow down is annoying. Considering adding try blocks where appropriate.