Extra safeguard when applying diffs