Fix for null/undefined objects in the diffs.