Catch None in filechooser when iterating files.
Merge pull request #2338 from matham/filenone

Catch None in filechooser when iterating files.