continue if except when reading file

continue if except when reading file
Merge branch 'dev'