Wrapped FileNotFoundException in file protocol correctly
Merge branch 'master' into 0.1.2