Add in some null checks
Fix issues with consuming delete updates beyond the end of the diff