Merge "Add error checking for file argument"