Added checks to file chooser.
Merge remote-tracking branch 'origin/master'
Small change.