Add FileNotFoundException
Rename some variables