Handle empty diff keys