Changed FileNotFOundException to 'return null'

Changed processing of 'file not found' to be same as 'no file specified', backport of #236