Only catch FileNotFoundExceptions
Merge branch 'master' into NET_40