Added further checks to reduce errors if file change log is invalid