Add a file check to ensure that the file exists before trying to process it
Merge branch 'release/v1.2'