Merge "Abort if firstpass file does not exist"