oldSnapshot can be null during merge. this is just a bandaid, not sure why this race condition occurs
oldSnapshot can be null during merge. this is just a bandaid, not sure why this race condition occurs

spebbe/cryson,spebbe/cryson