Merge "Add checks before casting entry.extraInfo."